Rename admission webhooks to avoid name collision (#725)

fixes #723
stashed · Apr 4, 2019 · 3af1ee2 · 3af1ee2
1 parent b1f960c
commit 3af1ee2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 17 deletions.
diff --git a/chart/stash/templates/mutating-webhook.yaml b/chart/stash/templates/mutating-webhook.yaml
@@ -17,7 +17,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/deployments
+      path: /apis/admission.stash.appscode.com/v1alpha1/deploymentmutators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -39,7 +39,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/daemonsets
+      path: /apis/admission.stash.appscode.com/v1alpha1/daemonsetmutators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -61,7 +61,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/statefulsets
+      path: /apis/admission.stash.appscode.com/v1alpha1/statefulsetmutators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -81,7 +81,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollers
+      path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollermutators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -102,7 +102,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/replicasets
+      path: /apis/admission.stash.appscode.com/v1alpha1/replicasetmutators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -140,4 +140,25 @@ webhooks:
 {{- if and (ge $major 1) (ge $minor 12) }}
   sideEffects: None
 {{- end }}
+- name: deploymentconfig.admission.stash.appscode.com
+  clientConfig:
+    service:
+      namespace: default
+      name: kubernetes
+      path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigmutators
+    caBundle: {{ b64enc .Values.apiserver.ca }}
+  rules:
+  - operations:
+    - CREATE
+    - UPDATE
+    apiGroups:
+    - apps.openshift.io
+    apiVersions:
+    - "*"
+    resources:
+    - deploymentconfigs
+  failurePolicy: Ignore
+{{- if and (ge $major 1) (ge $minor 12) }}
+  sideEffects: None
+{{- end }}
 {{ end }}
diff --git a/chart/stash/templates/validating-webhook.yaml b/chart/stash/templates/validating-webhook.yaml
@@ -17,7 +17,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/restics
+      path: /apis/admission.stash.appscode.com/v1alpha1/resticvalidators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -38,7 +38,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/recoveries
+      path: /apis/admission.stash.appscode.com/v1alpha1/recoveryvalidators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:
@@ -59,7 +59,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/repositories
+      path: /apis/admission.stash.appscode.com/v1alpha1/repositoryvalidators
     caBundle: {{ b64enc .Values.apiserver.ca }}
   rules:
   - operations:

diff --git a/hack/deploy/mutating-webhook.yaml b/hack/deploy/mutating-webhook.yaml
@@ -10,7 +10,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/deployments
+      path: /apis/admission.stash.appscode.com/v1alpha1/deploymentmutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -30,7 +30,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/daemonsets
+      path: /apis/admission.stash.appscode.com/v1alpha1/daemonsetmutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -50,7 +50,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/statefulsets
+      path: /apis/admission.stash.appscode.com/v1alpha1/statefulsetmutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -68,7 +68,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollers
+      path: /apis/admission.stash.appscode.com/v1alpha1/replicationcontrollermutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -87,7 +87,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/replicasets
+      path: /apis/admission.stash.appscode.com/v1alpha1/replicasetmutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -107,7 +107,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigs
+      path: /apis/admission.stash.appscode.com/v1alpha1/deploymentconfigmutators
     caBundle: ${KUBE_CA}
   rules:
   - operations:

diff --git a/hack/deploy/validating-webhook.yaml b/hack/deploy/validating-webhook.yaml
@@ -10,7 +10,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/restics
+      path: /apis/admission.stash.appscode.com/v1alpha1/resticvalidators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -29,7 +29,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/recoveries
+      path: /apis/admission.stash.appscode.com/v1alpha1/recoveryvalidators
     caBundle: ${KUBE_CA}
   rules:
   - operations:
@@ -48,7 +48,7 @@ webhooks:
     service:
       namespace: default
       name: kubernetes
-      path: /apis/admission.stash.appscode.com/v1alpha1/repositories
+      path: /apis/admission.stash.appscode.com/v1alpha1/repositoryvalidators
     caBundle: ${KUBE_CA}
   rules:
   - operations: