Skip to content

Commit 76df629

Browse files
Merge pull request csi-addons#99 from red-hat-storage/sync_us--main
Syncing latest changes from main for kubernetes-csi-addons
2 parents 5a89ec7 + 5ccc76e commit 76df629

File tree

6 files changed

+24
-2
lines changed

6 files changed

+24
-2
lines changed

apis/csiaddons/v1alpha1/networkfence_types.go

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ type SecretSpec struct {
5656
}
5757

5858
// NetworkFenceSpec defines the desired state of NetworkFence
59+
// +kubebuilder:validation:XValidation:rule="has(self.parameters) == has(oldSelf.parameters)",message="parameters are immutable"
60+
// +kubebuilder:validation:XValidation:rule="has(self.secret) == has(oldSelf.secret)",message="secret is immutable"
5961
type NetworkFenceSpec struct {
6062
// Driver contains the name of CSI driver.
6163
// +kubebuilder:validation:Required

apis/replication.storage/v1alpha1/volumereplicationclass_types.go

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
// VolumeReplicationClassSpec specifies parameters that an underlying storage system uses
2424
// when creating a volume replica. A specific VolumeReplicationClass is used by specifying
2525
// its name in a VolumeReplication object.
26+
// +kubebuilder:validation:XValidation:rule="has(self.parameters) == has(oldSelf.parameters)",message="parameters are immutable"
2627
type VolumeReplicationClassSpec struct {
2728
// Provisioner is the name of storage provisioner
2829
// +kubebuilder:validation:Required

config/crd/bases/csiaddons.openshift.io_networkfences.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ spec:
105105
- driver
106106
- fenceState
107107
type: object
108+
x-kubernetes-validations:
109+
- message: parameters are immutable
110+
rule: has(self.parameters) == has(oldSelf.parameters)
111+
- message: secret is immutable
112+
rule: has(self.secret) == has(oldSelf.secret)
108113
status:
109114
description: NetworkFenceStatus defines the observed state of NetworkFence
110115
properties:

config/crd/bases/replication.storage.openshift.io_volumereplicationclasses.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ spec:
6161
required:
6262
- provisioner
6363
type: object
64+
x-kubernetes-validations:
65+
- message: parameters are immutable
66+
rule: has(self.parameters) == has(oldSelf.parameters)
6467
status:
6568
description: VolumeReplicationClassStatus defines the observed state of
6669
VolumeReplicationClass.

deploy/controller/crds.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ spec:
213213
- driver
214214
- fenceState
215215
type: object
216+
x-kubernetes-validations:
217+
- message: parameters are immutable
218+
rule: has(self.parameters) == has(oldSelf.parameters)
219+
- message: secret is immutable
220+
rule: has(self.secret) == has(oldSelf.secret)
216221
status:
217222
description: NetworkFenceStatus defines the observed state of NetworkFence
218223
properties:
@@ -778,6 +783,9 @@ spec:
778783
required:
779784
- provisioner
780785
type: object
786+
x-kubernetes-validations:
787+
- message: parameters are immutable
788+
rule: has(self.parameters) == has(oldSelf.parameters)
781789
status:
782790
description: VolumeReplicationClassStatus defines the observed state of
783791
VolumeReplicationClass.

internal/connection/connection.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ type Connection struct {
3838
// NewConnection establishes connection with sidecar, fetches capability and returns Connection object
3939
// filled with required information.
4040
func NewConnection(ctx context.Context, endpoint, nodeID, driverName string) (*Connection, error) {
41-
opts := grpc.WithTransportCredentials(insecure.NewCredentials())
42-
cc, err := grpc.Dial(endpoint, opts)
41+
opts := []grpc.DialOption{
42+
grpc.WithTransportCredentials(insecure.NewCredentials()),
43+
grpc.WithIdleTimeout(time.Duration(0)),
44+
}
45+
cc, err := grpc.Dial(endpoint, opts...)
4346
if err != nil {
4447
return nil, err
4548
}

0 commit comments

Comments
 (0)