Merge pull request #4436 from pmtk/4.18-remove-csi-webhook

[release-4.18] USHIFT-5291: Remove CSI webhook due to deprecation

assets/release/release-aarch64.json

@@ -11,7 +11,6 @@
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcc1c450c4888d6b759636e508ee77f49592642454d4b59c908da0ae5297a31c",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac64c91ea6032efdfecf24de6ba1684549a3dcfccd20388e7bdd8a49910df15"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4"
   }
 }

assets/release/release-x86_64.json

@@ -11,7 +11,6 @@
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937e6ee08ea4bd899126c8daf2a9fa8c27ea3850257baeb278ecd8cad207fc47",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a870f9818c582a6dda22d591b0121bc1331c26eafc97bf007bcaaacb9c43e743",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31d9234ca87bcb644468c00195368de69383310dad22fdb88b4ec0a55eda627a",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45de22ed8e8644046c024ca117aba239b9fa585c1f847a4b2be83a272cba7c3d"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31d9234ca87bcb644468c00195368de69383310dad22fdb88b4ec0a55eda627a"
   }
 }

cmd/generate-config/config/config-openapi-spec.json

@@ -408,21 +408,19 @@
           ]
         },
         "optionalCsiComponents": {
-          "description": "OptionalCSIComponents is a user defined slice of CSIComponent values. These value tell MicroShift which\nadditional, non-driver, CSI controllers to deploy on start. MicroShift will deploy snapshot controller\nand webhook when no components are specified. This preserves the current deployment behavior of existing\nclusters. Users must set `.storage.optionalCsiComponents: []` to explicitly tell MicroShift not to deploy any CSI\ncomponents. The CSI Driver is excluded as it is typically deployed via the same manifest as the accompanying\nstorage driver. Like CSIStorageDriver, uninstallation is not supported as this can lead to orphaned storage\nobjects.\nAllowed values are: unset, [], or one or more of [\"snapshot-controller\", \"snapshot-webhook\"]",
+          "description": "OptionalCSIComponents is a user defined slice of CSIComponent values. These value tell MicroShift which\nadditional, non-driver, CSI controllers to deploy on start. MicroShift will deploy snapshot controller\nand webhook when no components are specified. This preserves the current deployment behavior of existing\nclusters. Users must set `.storage.optionalCsiComponents: []` to explicitly tell MicroShift not to deploy any CSI\ncomponents. The CSI Driver is excluded as it is typically deployed via the same manifest as the accompanying\nstorage driver. Like CSIStorageDriver, uninstallation is not supported as this can lead to orphaned storage\nobjects.\nAllowed values are: unset, [], or one or more of [\"snapshot-controller\"]",
           "type": "array",
           "items": {
             "description": "OptionalCsiComponent values determine which CSI components MicroShift should deploy. Currently only csi snapshot components\nare supported.",
             "type": "string",
             "enum": [
               "none",
               "snapshot-controller",
-              "snapshot-webhook",
               ""
             ]
           },
           "example": [
-            "snapshot-controller",
-            "snapshot-webhook"
+            "snapshot-controller"
           ]
         }
       }

docs/user/howto_config.md

@@ -359,9 +359,9 @@ specifying supported values under `.storage` node of the MicroShift config in th
 storage
   optionalCsiComponents: **ARRAY**.
 ```
-  - Expected values are: `['csi-snapshot-controller', 'csi-snapshot-webhook', 'none']`. `'none'` is mutually exclusive
+  - Expected values are: `['csi-snapshot-controller', 'none']`. `'none'` is mutually exclusive
   with all other values.
-  - Empty array defaults to deploying `snapshot-controller` and `snapshot-webhook`.
+  - Empty array defaults to deploying `snapshot-controller`.
 
 ### Automated Uninstallation is Not Supported
 

okd/src/README.md

@@ -38,7 +38,6 @@
     > oc get pods
     NAMESPACE                  NAME                                       READY   STATUS    RESTARTS        AGE
     kube-system                csi-snapshot-controller-7d6c78bc58-5p7tb   1/1     Running   0               8m52s
-    kube-system                csi-snapshot-webhook-5598db6db4-rmrpx      1/1     Running   0               8m54s
     openshift-dns              dns-default-2q89q                          2/2     Running   0               7m34s
     openshift-dns              node-resolver-k2c5h                        1/1     Running   0               8m54s
     openshift-ingress          router-default-db4b598b9-x8lvb             1/1     Running   0               8m52s

packaging/greenboot/microshift-running-check.sh

@@ -145,7 +145,7 @@ if lvmsShouldBeDeployed; then
     PODS_NS_LIST+=(openshift-storage)
     PODS_CT_LIST+=(2)
 fi
-declare -a csi_components=('csi-snapshot-controller' 'csi-snapshot-webhook')
+declare -a csi_components=('csi-snapshot-controller')
 csi_pods_ct=0
 for csi_c in "${csi_components[@]}"; do
     if csiComponentShouldBeDeployed "${csi_c}"; then

packaging/microshift/config.yaml

@@ -369,10 +369,9 @@ storage:
     # components. The CSI Driver is excluded as it is typically deployed via the same manifest as the accompanying
     # storage driver. Like CSIStorageDriver, uninstallation is not supported as this can lead to orphaned storage
     # objects.
-    # Allowed values are: unset, [], or one or more of ["snapshot-controller", "snapshot-webhook"]
+    # Allowed values are: unset, [], or one or more of ["snapshot-controller"]
     # example:
     #   - snapshot-controller
-    # - snapshot-webhook
     optionalCsiComponents:
         - ""
 

pkg/assets/scheme.go

@@ -2,6 +2,7 @@ package assets
 
 import (
 	sccv1 "github.com/openshift/api/security/v1"
+	arv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -27,4 +28,7 @@ func init() {
 	if err := sccv1.AddToScheme(scheme); err != nil {
 		panic(err)
 	}
+	if err := arv1.AddToScheme(scheme); err != nil {
+		panic(err)
+	}
 }