Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70ec151
Remove CSI webhook due to deprecation
pmtk Jan 20, 2025
b4c1a5d
Test the removal
pmtk Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions assets/components/csi-snapshot-controller/webhook_clusterrole.yaml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions assets/components/csi-snapshot-controller/webhook_clusterrolebinding.yaml
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions assets/components/csi-snapshot-controller/webhook_config.yaml
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions assets/components/csi-snapshot-controller/webhook_deployment.yaml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions assets/components/csi-snapshot-controller/webhook_service.yaml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
3 changes: 1 addition & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
6 changes: 2 additions & 4 deletions cmd/generate-config/config/config-openapi-spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs/user/howto_config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/storage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion okd/src/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/greenboot/microshift-running-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions packaging/microshift/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- ""

4 changes: 4 additions & 0 deletions pkg/assets/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,4 +28,7 @@ func init() {
if err := sccv1.AddToScheme(scheme); err != nil {
panic(err)
}
if err := arv1.AddToScheme(scheme); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary? Should we add a comment to explain?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is necessary to make deletion of arv1.ValidatingWebhookConfiguration in deleteCSIWebhook working. Standard kubernetes+Go procedure

panic(err)
}
}
Loading