Remove snapshot controller for azure file

openshift · Feb 22, 2024 · 59e2de9 · 59e2de9
1 parent 4f1a833
commit 59e2de9
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 128 deletions.
diff --git a/assets/overlays/azure-file/generated/hypershift/controller.yaml b/assets/overlays/azure-file/generated/hypershift/controller.yaml
@@ -12,13 +12,9 @@
 # attacher.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
 # Applied strategic merge patch attacher.yaml
 # resizer.yaml: Loaded from common/sidecars/resizer.yaml
-# resizer.yaml: Added arguments [--timeout=240s -handle-volume-inuse-error=false]
+# resizer.yaml: Added arguments [--timeout=120s -handle-volume-inuse-error=false]
 # resizer.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
 # Applied strategic merge patch resizer.yaml
-# snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml
-# snapshotter.yaml: Added arguments [--timeout=600s]
-# snapshotter.yaml: Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
-# Applied strategic merge patch snapshotter.yaml
 # livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
 # livenessprobe.yaml: Added arguments [--probe-timeout=3s]
 # Applied strategic merge patch livenessprobe.yaml
@@ -266,7 +262,7 @@ spec:
         - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
         - --leader-election-namespace=openshift-cluster-csi-drivers
         - --v=${LOG_LEVEL}
-        - --timeout=240s
+        - --timeout=120s
         - -handle-volume-inuse-error=false
         - --kubeconfig=$(KUBECONFIG)
         env:
@@ -307,55 +303,6 @@ spec:
         volumeMounts:
         - mountPath: /etc/tls/private
           name: metrics-serving-cert
-      - args:
-        - --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
-        - --metrics-address=localhost:8216
-        - --leader-election
-        - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
-        - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
-        - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
-        - --leader-election-namespace=openshift-cluster-csi-drivers
-        - --v=${LOG_LEVEL}
-        - --timeout=600s
-        - --kubeconfig=$(KUBECONFIG)
-        env:
-        - name: KUBECONFIG
-          value: /etc/hosted-kubernetes/kubeconfig
-        image: ${SNAPSHOTTER_IMAGE}
-        imagePullPolicy: IfNotPresent
-        name: csi-snapshotter
-        resources:
-          requests:
-            cpu: 10m
-            memory: 50Mi
-        volumeMounts:
-        - mountPath: /var/lib/csi/sockets/pluginproxy/
-          name: socket-dir
-        - mountPath: /etc/hosted-kubernetes
-          name: hosted-kubeconfig
-          readOnly: true
-      - args:
-        - --secure-listen-address=0.0.0.0:9216
-        - --upstream=http://127.0.0.1:8216/
-        - --tls-cert-file=/etc/tls/private/tls.crt
-        - --tls-private-key-file=/etc/tls/private/tls.key
-        - --tls-cipher-suites=${TLS_CIPHER_SUITES}
-        - --tls-min-version=${TLS_MIN_VERSION}
-        - --logtostderr=true
-        image: ${KUBE_RBAC_PROXY_IMAGE}
-        imagePullPolicy: IfNotPresent
-        name: snapshotter-kube-rbac-proxy
-        ports:
-        - containerPort: 9216
-          name: snapshotter-m
-          protocol: TCP
-        resources:
-          requests:
-            cpu: 10m
-            memory: 20Mi
-        volumeMounts:
-        - mountPath: /etc/tls/private
-          name: metrics-serving-cert
       - args:
         - --csi-address=/csi/csi.sock
         - --health-port=10303

diff --git a/assets/overlays/azure-file/generated/hypershift/manifests.yaml b/assets/overlays/azure-file/generated/hypershift/manifests.yaml
@@ -13,7 +13,6 @@ guestStaticAssetNames:
 - main_attacher_binding.yaml
 - main_provisioner_binding.yaml
 - main_resizer_binding.yaml
-- main_snapshotter_binding.yaml
 - node.yaml
 - node_privileged_binding.yaml
 - node_sa.yaml

diff --git a/assets/overlays/azure-file/generated/hypershift/service.yaml b/assets/overlays/azure-file/generated/hypershift/service.yaml
@@ -5,7 +5,6 @@
 # Applied strategic merge patch common/metrics/service_add_port.yaml
 # Applied strategic merge patch common/metrics/service_add_port.yaml
 # Applied strategic merge patch common/metrics/service_add_port.yaml
-# Applied strategic merge patch common/metrics/service_add_port.yaml
 #
 #
 
@@ -32,10 +31,6 @@ spec:
     port: 9214
     protocol: TCP
     targetPort: resizer-m
-  - name: snapshotter-m
-    port: 9215
-    protocol: TCP
-    targetPort: snapshotter-m
   - name: driver-m
     port: 9211
     protocol: TCP

diff --git a/assets/overlays/azure-file/generated/standalone/controller.yaml b/assets/overlays/azure-file/generated/standalone/controller.yaml
@@ -10,11 +10,8 @@
 # attacher.yaml: Added arguments [--timeout=120s]
 # Applied strategic merge patch attacher.yaml
 # resizer.yaml: Loaded from common/sidecars/resizer.yaml
-# resizer.yaml: Added arguments [--timeout=240s -handle-volume-inuse-error=false]
+# resizer.yaml: Added arguments [--timeout=120s -handle-volume-inuse-error=false]
 # Applied strategic merge patch resizer.yaml
-# snapshotter.yaml: Loaded from common/sidecars/snapshotter.yaml
-# snapshotter.yaml: Added arguments [--timeout=600s]
-# Applied strategic merge patch snapshotter.yaml
 # livenessprobe.yaml: Loaded from common/sidecars/livenessprobe.yaml
 # livenessprobe.yaml: Added arguments [--probe-timeout=3s]
 # Applied strategic merge patch livenessprobe.yaml
@@ -218,7 +215,7 @@ spec:
         - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
         - --leader-election-namespace=openshift-cluster-csi-drivers
         - --v=${LOG_LEVEL}
-        - --timeout=240s
+        - --timeout=120s
         - -handle-volume-inuse-error=false
         env: []
         image: ${RESIZER_IMAGE}
@@ -253,49 +250,6 @@ spec:
         volumeMounts:
         - mountPath: /etc/tls/private
           name: metrics-serving-cert
-      - args:
-        - --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
-        - --metrics-address=localhost:8216
-        - --leader-election
-        - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
-        - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
-        - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
-        - --leader-election-namespace=openshift-cluster-csi-drivers
-        - --v=${LOG_LEVEL}
-        - --timeout=600s
-        env: []
-        image: ${SNAPSHOTTER_IMAGE}
-        imagePullPolicy: IfNotPresent
-        name: csi-snapshotter
-        resources:
-          requests:
-            cpu: 10m
-            memory: 50Mi
-        volumeMounts:
-        - mountPath: /var/lib/csi/sockets/pluginproxy/
-          name: socket-dir
-      - args:
-        - --secure-listen-address=0.0.0.0:9216
-        - --upstream=http://127.0.0.1:8216/
-        - --tls-cert-file=/etc/tls/private/tls.crt
-        - --tls-private-key-file=/etc/tls/private/tls.key
-        - --tls-cipher-suites=${TLS_CIPHER_SUITES}
-        - --tls-min-version=${TLS_MIN_VERSION}
-        - --logtostderr=true
-        image: ${KUBE_RBAC_PROXY_IMAGE}
-        imagePullPolicy: IfNotPresent
-        name: snapshotter-kube-rbac-proxy
-        ports:
-        - containerPort: 9216
-          name: snapshotter-m
-          protocol: TCP
-        resources:
-          requests:
-            cpu: 10m
-            memory: 20Mi
-        volumeMounts:
-        - mountPath: /etc/tls/private
-          name: metrics-serving-cert
       - args:
         - --csi-address=/csi/csi.sock
         - --health-port=10303

diff --git a/assets/overlays/azure-file/generated/standalone/manifests.yaml b/assets/overlays/azure-file/generated/standalone/manifests.yaml
@@ -18,7 +18,6 @@ guestStaticAssetNames:
 - main_attacher_binding.yaml
 - main_provisioner_binding.yaml
 - main_resizer_binding.yaml
-- main_snapshotter_binding.yaml
 - node.yaml
 - node_privileged_binding.yaml
 - node_sa.yaml

diff --git a/assets/overlays/azure-file/generated/standalone/service.yaml b/assets/overlays/azure-file/generated/standalone/service.yaml
@@ -5,7 +5,6 @@
 # Applied strategic merge patch common/metrics/service_add_port.yaml
 # Applied strategic merge patch common/metrics/service_add_port.yaml
 # Applied strategic merge patch common/metrics/service_add_port.yaml
-# Applied strategic merge patch common/metrics/service_add_port.yaml
 #
 #
 
@@ -32,10 +31,6 @@ spec:
     port: 9214
     protocol: TCP
     targetPort: resizer-m
-  - name: snapshotter-m
-    port: 9215
-    protocol: TCP
-    targetPort: snapshotter-m
   - name: driver-m
     port: 9211
     protocol: TCP

diff --git a/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml b/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml
@@ -5,7 +5,6 @@
 # Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
 # Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
 # Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
-# Applied JSON patch common/metrics/service_monitor_add_port.yaml.patch
 #
 #
 
@@ -40,14 +39,6 @@ spec:
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
       serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
-    path: /metrics
-    port: snapshotter-m
-    scheme: https
-    tlsConfig:
-      caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-      serverName: azure-file-csi-driver-controller-metrics.${NAMESPACE}.svc
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 30s
     path: /metrics

diff --git a/pkg/driver/azure-file/azure_file.go b/pkg/driver/azure-file/azure_file.go
@@ -74,12 +74,9 @@ func GetAzureFileGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 					"--timeout=120s",
 				),
 				commongenerator.DefaultResizer.WithExtraArguments(
-					"--timeout=240s",
+					"--timeout=120s",
 					"-handle-volume-inuse-error=false",
 				),
-				commongenerator.DefaultSnapshotter.WithExtraArguments(
-					"--timeout=600s",
-				),
 				commongenerator.DefaultLivenessProbe.WithExtraArguments(
 					"--probe-timeout=3s",
 				),