kubeflow · google-oss-robot · Mar 19, 2021 · Mar 16, 2021 · Mar 19, 2021
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
@@ -15,6 +15,9 @@ spec:
         - mountPath: /etc/webhook/certs
           name: webhook-cert
           readOnly: true
+        ports:
+        - name: https-webhook
+          containerPort: 4443
       volumes:
       - name: webhook-cert
         secret:

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
@@ -4,5 +4,6 @@ metadata:
   name: service
 spec:
   ports:
-  - port: 443
-    targetPort: 4443
+  - name: https-webhook
+    port: 443
+    targetPort: https-webhook
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