Fixing in kubeflow/dashboard

Author: Misha6Sharma

components/poddefaults-webhooks/manifests/overlays/cert-manager/kustomization.yaml

@@ -4,23 +4,24 @@
 # the certificate.
 # TODO(jlewi): We should eventually refactor the manifests to delete
 # bootstrap and use certmanager by default.
-bases:
+resources:
 - ../../base
 
+
 resources:
 - certificate.yaml
 
 namespace: kubeflow
 
-commonLabels:
+labels:
   app: poddefaults
   kustomize.component: poddefaults
   app.kubernetes.io/component: poddefaults
   app.kubernetes.io/name: poddefaults
 
-patchesStrategicMerge:
-- mutating-webhook-configuration.yaml
-- deployment.yaml
+patches:
+- path: mutating-webhook-configuration.yaml
+- path: deployment.yaml
 
 generatorOptions:
   disableNameSuffixHash: true

components/profile-controller/config/base/kustomization.yaml

@@ -6,8 +6,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../default
-patchesStrategicMerge:
-- patches/manager.yaml
+patches:
+patches:
+- path: patches/manager.yaml
+
 
 images:
 - name: ghcr.io/kubeflow/dashboard/profile-controller

components/profile-controller/config/crd/kustomization.yaml

@@ -1,22 +1,20 @@
 # This kustomization.yaml is not intended to be run by itself,
 # since it depends on service name and namespace that are out of this kustomize package.
-# It should be run by config/default
+# It should be run by config/default.
+
 resources:
-- bases/kubeflow.org_profiles.yaml
+  - bases/kubeflow.org_profiles.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
-- patches/trivial_conversion_patch.yaml
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
-# patches here are for enabling the conversion webhook for each CRD
-#- patches/webhook_in_profiles.yaml
+patches:
+  - path: patches/trivial_conversion_patch.yaml
+  # Enable webhook conversion for CRD
+  - path: patches/webhook_in_profiles.yaml
+  # Enable CA injection for CRD using cert-manager
+  - path: patches/cainjection_in_profiles.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
-
-# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
-# patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_profiles.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
-# the following config is for teaching kustomize how to do kustomization for CRDs.
+# This configuration teaches Kustomize how to process CRDs.
 configurations:
-- kustomizeconfig.yaml
+  - kustomizeconfig.yaml

components/profile-controller/config/default/kustomization.yaml

@@ -1,4 +1,6 @@
 # Adds namespace to all resources.
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 namespace: profiles-system
 
 # Value of this field is prepended to the
@@ -9,10 +11,10 @@ namespace: profiles-system
 namePrefix: profiles-
 
 # Labels to add to all resources and selectors.
-commonLabels:
+labels:
   kustomize.component: profiles
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
@@ -24,7 +26,7 @@ bases:
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
 
-patchesStrategicMerge:
+patches:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
@@ -45,32 +47,20 @@ patchesStrategicMerge:
 # 'CERTMANAGER' needs to be enabled to use ca injection
 #- webhookcainjection_patch.yaml
 
-# the following config is for teaching kustomize how to do var substitution
-vars:
-# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
-#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
-#  objref:
-#    kind: Certificate
-#    group: cert-manager.io
-#    version: v1
-#    name: serving-cert # this name should match the one in certificate.yaml
-#  fieldref:
-#    fieldpath: metadata.namespace
-#- name: CERTIFICATE_NAME
-#  objref:
-#    kind: Certificate
-#    group: cert-manager.io
-#    version: v1
-#    name: serving-cert # this name should match the one in certificate.yaml
-#- name: SERVICE_NAMESPACE # namespace of the service
-#  objref:
-#    kind: Service
-#    version: v1
-#    name: webhook-service
-#  fieldref:
-#    fieldpath: metadata.namespace
-#- name: SERVICE_NAME
-#  objref:
-#    kind: Service
-#    version: v1
-#    name: webhook-service
+# The following config is for teaching Kustomize how to perform replacements
+replacements:
+# [CERTMANAGER] Uncomment if enabling cert-manager.
+# - source:
+#     kind: Certificate
+#     group: cert-manager.io
+#     version: v1
+#     name: serving-cert
+#     fieldPath: metadata.namespace
+#   targets:
+#   - select:
+#       kind: MutatingWebhookConfiguration
+#     fieldPaths:
+#     - metadata.annotations.[cert-manager.io/inject-ca-from]
+#     options:
+#       delimiter: /
+#       index: 0

components/profile-controller/config/overlays/kubeflow/kustomization.yaml

@@ -1,30 +1,38 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
+
 resources:
 - ../../base
 - service.yaml
 - virtual-service.yaml
 - authorizationpolicy.yaml
 
-commonLabels:
-  kustomize.component: profiles
+labels:
+- includeSelectors: true
+  pairs:
+    kustomize.component: profiles
 
-patchesStrategicMerge:
-- patches/kfam.yaml
-- patches/remove-namespace.yaml
+patches:
+- path: patches/kfam.yaml
+- path: patches/remove-namespace.yaml
 
 configurations:
 - params.yaml
 
-vars:
-- name: PROFILES_NAMESPACE
-  fieldref:
-    fieldpath: metadata.namespace
-  objref:
-    name: profiles-kfam
+replacements:
+- source:
+    fieldPath: metadata.namespace
     kind: Service
-    apiVersion: v1
+    name: profiles-kfam
+    version: v1
+  targets:
+  - fieldPaths:
+    - metadata.namespace
+    select:
+      kind: Service
+      name: profiles-kfam
+      version: v1
 
 images:
 - name: ghcr.io/kubeflow/dashboard/access-management