Skip to content

Commit 2018187

Browse files
Merge pull request #4436 from pmtk/4.18-remove-csi-webhook
[release-4.18] USHIFT-5291: Remove CSI webhook due to deprecation
2 parents 9b3c197 + b4c1a5d commit 2018187

File tree

24 files changed

+101
-260
lines changed

24 files changed

+101
-260
lines changed

assets/components/csi-snapshot-controller/webhook_clusterrole.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

assets/components/csi-snapshot-controller/webhook_clusterrolebinding.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

assets/components/csi-snapshot-controller/webhook_config.yaml

Lines changed: 0 additions & 42 deletions
This file was deleted.

assets/components/csi-snapshot-controller/webhook_deployment.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

assets/components/csi-snapshot-controller/webhook_service.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

assets/release/release-aarch64.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcc1c450c4888d6b759636e508ee77f49592642454d4b59c908da0ae5297a31c",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac64c91ea6032efdfecf24de6ba1684549a3dcfccd20388e7bdd8a49910df15"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:610c51e225c86c53aa1a30fd354f744e1e62a7578169f161969522fe88c27af4"
1615
}
1716
}

assets/release/release-x86_64.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937e6ee08ea4bd899126c8daf2a9fa8c27ea3850257baeb278ecd8cad207fc47",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a870f9818c582a6dda22d591b0121bc1331c26eafc97bf007bcaaacb9c43e743",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31d9234ca87bcb644468c00195368de69383310dad22fdb88b4ec0a55eda627a",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45de22ed8e8644046c024ca117aba239b9fa585c1f847a4b2be83a272cba7c3d"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31d9234ca87bcb644468c00195368de69383310dad22fdb88b4ec0a55eda627a"
1615
}
1716
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,21 +408,19 @@
408408
]
409409
},
410410
"optionalCsiComponents": {
411-
"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\"]",
411+
"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\"]",
412412
"type": "array",
413413
"items": {
414414
"description": "OptionalCsiComponent values determine which CSI components MicroShift should deploy. Currently only csi snapshot components\nare supported.",
415415
"type": "string",
416416
"enum": [
417417
"none",
418418
"snapshot-controller",
419-
"snapshot-webhook",
420419
""
421420
]
422421
},
423422
"example": [
424-
"snapshot-controller",
425-
"snapshot-webhook"
423+
"snapshot-controller"
426424
]
427425
}
428426
}

docs/user/howto_config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ specifying supported values under `.storage` node of the MicroShift config in th
359359
storage
360360
optionalCsiComponents: **ARRAY**.
361361
```
362-
- Expected values are: `['csi-snapshot-controller', 'csi-snapshot-webhook', 'none']`. `'none'` is mutually exclusive
362+
- Expected values are: `['csi-snapshot-controller', 'none']`. `'none'` is mutually exclusive
363363
with all other values.
364-
- Empty array defaults to deploying `snapshot-controller` and `snapshot-webhook`.
364+
- Empty array defaults to deploying `snapshot-controller`.
365365

366366
### Automated Uninstallation is Not Supported
367367

0 commit comments

Comments
 (0)