Skip to content

Commit 80d5b31

Browse files
Merge pull request #4346 from pmtk/remove-csi-webhook
USHIFT-5226: Remove CSI webhook due to deprecation
2 parents e8e9f28 + db26897 commit 80d5b31

File tree

23 files changed

+41
-286
lines changed

23 files changed

+41
-286
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:618a701c092403624182c4969c1a6a2f4aadd26c7b50e46c7fbe7175da0f3575",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbe4e12785990a4764abb85ef5c5c64bdaafa83c29e35beb77e03d995f0b256",
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:b7c79ee759c3bb9ae50d27d7487c9dc9de5224c9175ac9636f500ab0fd46e90b",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30ca243687727c62df5c0f952105a52c6e587c1ec0f348ae91bf8e09de7f2494"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7c79ee759c3bb9ae50d27d7487c9dc9de5224c9175ac9636f500ab0fd46e90b"
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:9baab801b7c1371ecebdbb4570228756e056689e7f834fbfc597df4c8eb1e3fd",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91a5da769452f47bb5c2518174474b08d466344cd9a46f49d386f0562e88acd",
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:d49a8e92e26b4e27adbb1d37cf15a2ea2ae0501054ff9db1a355c80802fdc9ba",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41c28bd33107bba44960076491be57572c782b1275ae5519b0bcd04853efbdb8"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d49a8e92e26b4e27adbb1d37cf15a2ea2ae0501054ff9db1a355c80802fdc9ba"
1615
}
1716
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,21 +434,19 @@
434434
]
435435
},
436436
"optionalCsiComponents": {
437-
"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\"]",
437+
"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\nwhen 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\"]",
438438
"type": "array",
439439
"items": {
440440
"description": "OptionalCsiComponent values determine which CSI components MicroShift should deploy. Currently only csi snapshot components\nare supported.",
441441
"type": "string",
442442
"enum": [
443443
"none",
444444
"snapshot-controller",
445-
"snapshot-webhook",
446445
""
447446
]
448447
},
449448
"example": [
450-
"snapshot-controller",
451-
"snapshot-webhook"
449+
"snapshot-controller"
452450
]
453451
}
454452
}

docs/user/howto_config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ specifying supported values under `.storage` node of the MicroShift config in th
367367
storage
368368
optionalCsiComponents: **ARRAY**.
369369
```
370-
- Expected values are: `['csi-snapshot-controller', 'csi-snapshot-webhook', 'none']`. `'none'` is mutually exclusive
370+
- Expected values are: `['csi-snapshot-controller', 'none']`. `'none'` is mutually exclusive
371371
with all other values.
372-
- Empty array defaults to deploying `snapshot-controller` and `snapshot-webhook`.
372+
- Empty array defaults to deploying `snapshot-controller`.
373373

374374
### Automated Uninstallation is Not Supported
375375

0 commit comments

Comments
 (0)