admission-webhook: Consolidate manifests

Signed-off-by: Yannis Zarkadas <yanniszark@arrikto.com>
kubeflow · Mar 19, 2021 · bab9d10 · bab9d10
1 parent 86c1b95
commit bab9d10
Show file tree

Hide file tree

Showing 30 changed files with 58 additions and 384 deletions.
diff --git a/...ts/webhook/base/cluster-role-binding.yaml → .../manifests/base/cluster-role-binding.yaml b/...ts/webhook/base/cluster-role-binding.yaml → .../manifests/base/cluster-role-binding.yaml
diff --git a/.../manifests/webhook/base/cluster-role.yaml → ...-webhook/manifests/base/cluster-role.yaml b/.../manifests/webhook/base/cluster-role.yaml → ...-webhook/manifests/base/cluster-role.yaml
diff --git a/...n-webhook/manifests/webhook/base/crd.yaml → ...admission-webhook/manifests/base/crd.yaml b/...n-webhook/manifests/webhook/base/crd.yaml → ...admission-webhook/manifests/base/crd.yaml
diff --git a/...ok/manifests/webhook/base/deployment.yaml → ...on-webhook/manifests/base/deployment.yaml b/...ok/manifests/webhook/base/deployment.yaml → ...on-webhook/manifests/base/deployment.yaml
diff --git a/...manifests/webhook/base/kustomization.yaml → ...webhook/manifests/base/kustomization.yaml b/...manifests/webhook/base/kustomization.yaml → ...webhook/manifests/base/kustomization.yaml
@@ -9,18 +9,15 @@ resources:
 - service.yaml
 - crd.yaml
 commonLabels:
-  app: admission-webhook
-  kustomize.component: admission-webhook
-namePrefix: admission-webhook-
+  app: poddefaults
+  kustomize.component: poddefaults
+  app.kubernetes.io/component: poddefaults
+  app.kubernetes.io/name: poddefaults
 images:
 - name: gcr.io/kubeflow-images-public/admission-webhook
   newName: gcr.io/kubeflow-images-public/admission-webhook
   newTag: vmaster-ge5452b6f
 namespace: kubeflow
-configMapGenerator:
-- envs:
-  - params.env
-  name: admission-webhook-parameters
 generatorOptions:
   disableNameSuffixHash: true
 vars:
@@ -31,12 +28,12 @@ vars:
 # We need the var names to be relatively unique so that when we
 # compose with other applications they won't conflict.
 - fieldref:
-    fieldPath: data.namespace
+    fieldPath: metadata.namespace
   name: podDefaultsNamespace
   objref:
     apiVersion: v1
-    kind: ConfigMap
-    name: admission-webhook-parameters
+    kind: Service
+    name: service
 - fieldref:
     fieldPath: metadata.name
   name: podDefaultsServiceName

diff --git a/.../base/mutating-webhook-configuration.yaml → .../base/mutating-webhook-configuration.yaml b/.../base/mutating-webhook-configuration.yaml → .../base/mutating-webhook-configuration.yaml
@@ -6,8 +6,7 @@ webhooks:
 - clientConfig:
     caBundle: ""
     service:
-      name: $(podDefaultsServiceName)
-      namespace: $(podDefaultsNamespace)
+      name: service
       path: /apply-poddefault
   name: $(podDefaultsDeploymentName).kubeflow.org
   namespaceSelector:

diff --git a/components/admission-webhook/manifests/base/params.yaml b/components/admission-webhook/manifests/base/params.yaml
@@ -0,0 +1,19 @@
+varReference:
+- path: webhooks/clientConfig/service/namespace
+  kind: MutatingWebhookConfiguration
+- path: webhooks/clientConfig/service/name
+  kind: MutatingWebhookConfiguration
+- path: webhooks/name
+  kind: MutatingWebhookConfiguration
+nameReference:
+- kind: Service
+  version: v1
+  fieldSpecs:
+  - kind: MutatingWebhookConfiguration
+    group: admissionregistration.k8s.io
+    path: webhooks/clientConfig/service/name
+namespace:
+- kind: MutatingWebhookConfiguration
+  group: admissionregistration.k8s.io
+  path: webhooks/clientConfig/service/namespace
+  create: true
diff --git a/...fests/bootstrap/base/service-account.yaml → ...bhook/manifests/base/service-account.yaml b/...fests/bootstrap/base/service-account.yaml → ...bhook/manifests/base/service-account.yaml
diff --git a/...bhook/manifests/webhook/base/service.yaml → ...ssion-webhook/manifests/base/service.yaml b/...bhook/manifests/webhook/base/service.yaml → ...ssion-webhook/manifests/base/service.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/cluster-role-binding.yaml b/components/admission-webhook/manifests/bootstrap/base/cluster-role-binding.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/cluster-role.yaml b/components/admission-webhook/manifests/bootstrap/base/cluster-role.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/config-map.yaml b/components/admission-webhook/manifests/bootstrap/base/config-map.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/kustomization.yaml b/components/admission-webhook/manifests/bootstrap/base/kustomization.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/params.env b/components/admission-webhook/manifests/bootstrap/base/params.env
diff --git a/components/admission-webhook/manifests/bootstrap/base/params.yaml b/components/admission-webhook/manifests/bootstrap/base/params.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/base/stateful-set.yaml b/components/admission-webhook/manifests/bootstrap/base/stateful-set.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/overlays/application/application.yaml b/components/admission-webhook/manifests/bootstrap/overlays/application/application.yaml
diff --git a/components/admission-webhook/manifests/bootstrap/overlays/application/kustomization.yaml b/components/admission-webhook/manifests/bootstrap/overlays/application/kustomization.yaml
diff --git a/...ok/overlays/cert-manager/certificate.yaml → ...ts/overlays/cert-manager/certificate.yaml b/...ok/overlays/cert-manager/certificate.yaml → ...ts/overlays/cert-manager/certificate.yaml
@@ -1,14 +1,23 @@
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
-  name: admission-webhook-cert
+  name: cert
 spec:
   isCA: true
   commonName: $(podDefaultsServiceName).$(podDefaultsNamespace).svc
   dnsNames:
   - $(podDefaultsServiceName).$(podDefaultsNamespace).svc
   - $(podDefaultsServiceName).$(podDefaultsNamespace).svc.cluster.local
   issuerRef:
-    kind: ClusterIssuer
-    name: $(podDefaultsIssuer)
-  secretName: webhook-certs
+    kind: Issuer
+    name: selfsigned-issuer
+  secretName: webhook-certs
+
+---
+
+apiVersion: cert-manager.io/v1alpha2
+kind: Issuer
+metadata:
+  name: selfsigned-issuer
+spec:
+  selfSigned: {}
diff --git a/...ook/overlays/cert-manager/deployment.yaml → ...sts/overlays/cert-manager/deployment.yaml b/...ook/overlays/cert-manager/deployment.yaml → ...sts/overlays/cert-manager/deployment.yaml