Skip to content

Commit 9b6b857

Browse files
authored
Revert "OSD-16469 - Add ingress controller webhook"
1 parent 83cb48e commit 9b6b857

File tree

6 files changed

+2
-621
lines changed

6 files changed

+2
-621
lines changed

build/selectorsyncset.yaml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -237,38 +237,6 @@ objects:
237237
scope: Cluster
238238
sideEffects: None
239239
timeoutSeconds: 2
240-
- apiVersion: admissionregistration.k8s.io/v1
241-
kind: ValidatingWebhookConfiguration
242-
metadata:
243-
annotations:
244-
service.beta.openshift.io/inject-cabundle: "true"
245-
creationTimestamp: null
246-
name: sre-ingresscontroller-validation
247-
webhooks:
248-
- admissionReviewVersions:
249-
- v1
250-
clientConfig:
251-
service:
252-
name: validation-webhook
253-
namespace: openshift-validation-webhook
254-
path: /ingresscontroller-validation
255-
failurePolicy: Ignore
256-
matchPolicy: Equivalent
257-
name: ingresscontroller-validation.managed.openshift.io
258-
rules:
259-
- apiGroups:
260-
- operator.openshift.io
261-
apiVersions:
262-
- '*'
263-
operations:
264-
- CREATE
265-
- UPDATE
266-
resources:
267-
- ingresscontroller
268-
- ingresscontrollers
269-
scope: Namespaced
270-
sideEffects: None
271-
timeoutSeconds: 1
272240
- apiVersion: admissionregistration.k8s.io/v1
273241
kind: ValidatingWebhookConfiguration
274242
metadata:

docs/webhooks-short.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
"webhookName": "imagecontentpolicies-validation",
1616
"documentString": "Managed OpenShift customers may not create ImageContentSourcePolicy, ImageDigestMirrorSet, or ImageTagMirrorSet resources that configure mirrors for the entirety of quay.io, registry.redhat.io, nor registry.access.redhat.com. If needed, specific repositories can have mirrors configured, such as quay.io/example."
1717
},
18-
{
19-
"webhookName": "ingresscontroller-validation",
20-
"documentString": "Managed OpenShift Customer may create IngressControllers without necessary taints. This can cause those workloads to be provisioned on infra or master nodes."
21-
},
2218
{
2319
"webhookName": "namespace-validation",
2420
"documentString": "Managed OpenShift Customers may not modify namespaces specified in the [openshift-monitoring/addons-namespaces openshift-monitoring/managed-namespaces openshift-monitoring/ocp-namespaces] ConfigMaps because customer workloads should be placed in customer-created namespaces. Customers may not create namespaces identified by this regular expression (^com$|^io$|^in$) because it could interfere with critical DNS resolution. Additionally, customers may not set or change the values of these Namespace labels [managed.openshift.io/storage-pv-quota-exempt managed.openshift.io/service-lb-quota-exempt]."
@@ -33,7 +29,7 @@
3329
},
3430
{
3531
"webhookName": "regular-user-validation",
36-
"documentString": "Managed OpenShift customers may not manage any objects in the following APIgroups [autoscaling.openshift.io cloudcredential.openshift.io admissionregistration.k8s.io ocmagent.managed.openshift.io upgrade.managed.openshift.io machine.openshift.io managed.openshift.io operator.openshift.io splunkforwarder.managed.openshift.io network.openshift.io addons.managed.openshift.io cloudingress.managed.openshift.io config.openshift.io machineconfiguration.openshift.io], nor may Managed OpenShift customers alter the APIServer, KubeAPIServer, OpenShiftAPIServer, ClusterVersion, Proxy or SubjectPermission objects."
32+
"documentString": "Managed OpenShift customers may not manage any objects in the following APIgroups [cloudcredential.openshift.io machine.openshift.io admissionregistration.k8s.io operator.openshift.io splunkforwarder.managed.openshift.io upgrade.managed.openshift.io machineconfiguration.openshift.io managed.openshift.io ocmagent.managed.openshift.io network.openshift.io config.openshift.io addons.managed.openshift.io cloudingress.managed.openshift.io autoscaling.openshift.io], nor may Managed OpenShift customers alter the APIServer, KubeAPIServer, OpenShiftAPIServer, ClusterVersion, Proxy or SubjectPermission objects."
3733
},
3834
{
3935
"webhookName": "regular-user-validation-osd",

docs/webhooks.json

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,29 +108,6 @@
108108
],
109109
"documentString": "Managed OpenShift customers may not create ImageContentSourcePolicy, ImageDigestMirrorSet, or ImageTagMirrorSet resources that configure mirrors for the entirety of quay.io, registry.redhat.io, nor registry.access.redhat.com. If needed, specific repositories can have mirrors configured, such as quay.io/example."
110110
},
111-
{
112-
"webhookName": "ingresscontroller-validation",
113-
"rules": [
114-
{
115-
"operations": [
116-
"CREATE",
117-
"UPDATE"
118-
],
119-
"apiGroups": [
120-
"operator.openshift.io"
121-
],
122-
"apiVersions": [
123-
"*"
124-
],
125-
"resources": [
126-
"ingresscontroller",
127-
"ingresscontrollers"
128-
],
129-
"scope": "Namespaced"
130-
}
131-
],
132-
"documentString": "Managed OpenShift Customer may create IngressControllers without necessary taints. This can cause those workloads to be provisioned on infra or master nodes."
133-
},
134111
{
135112
"webhookName": "namespace-validation",
136113
"rules": [
@@ -341,7 +318,7 @@
341318
"scope": "*"
342319
}
343320
],
344-
"documentString": "Managed OpenShift customers may not manage any objects in the following APIgroups [operator.openshift.io splunkforwarder.managed.openshift.io config.openshift.io upgrade.managed.openshift.io autoscaling.openshift.io machineconfiguration.openshift.io network.openshift.io cloudcredential.openshift.io managed.openshift.io addons.managed.openshift.io cloudingress.managed.openshift.io ocmagent.managed.openshift.io machine.openshift.io admissionregistration.k8s.io], nor may Managed OpenShift customers alter the APIServer, KubeAPIServer, OpenShiftAPIServer, ClusterVersion, Proxy or SubjectPermission objects."
321+
"documentString": "Managed OpenShift customers may not manage any objects in the following APIgroups [addons.managed.openshift.io ocmagent.managed.openshift.io operator.openshift.io network.openshift.io admissionregistration.k8s.io cloudingress.managed.openshift.io splunkforwarder.managed.openshift.io upgrade.managed.openshift.io config.openshift.io cloudcredential.openshift.io machine.openshift.io managed.openshift.io autoscaling.openshift.io machineconfiguration.openshift.io], nor may Managed OpenShift customers alter the APIServer, KubeAPIServer, OpenShiftAPIServer, ClusterVersion, Proxy or SubjectPermission objects."
345322
},
346323
{
347324
"webhookName": "regular-user-validation-osd",

pkg/webhooks/add_ingresscontroller.go

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

pkg/webhooks/ingresscontroller/ingresscontroller.go

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

0 commit comments

Comments
 (0)