accepted change to ghcr as part of rebase

vikas-saxena02 · vikas-saxena02 · commit 806fc879267d · 2025-05-11T20:55:50.000+10:00
Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed ui-virtual-service.yaml Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> replaced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> repalced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> replaced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> accepted change of image repo to ghcr as part of rebase Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> accepted change of image repo to ghcr as part of rebase Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> accepted change of image repo to ghcr as part of rebase Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> accepted change to ghcr as part of rebase Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed ui-virtual-service.yaml Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> replaced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> repalced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> replaced vars with replacements Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> ran kustomizr edit fix Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> ran kustomizr edit fix Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> ran kustomize edit fix Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> ran kustomize edit fix Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> trying to get rdi of error Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> removing braces in kustomization.yaml Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> refactoring code to get ridd of missing value Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixing code alignment issue Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> removed patches from customization file Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> added placeholder values Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> replaced placeholder value Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> removed patches dir Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> added skipping of . as mentioned at https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/replacements/#field-path-format Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed wanring in katib-standalone-postgres/kustomization.yaml Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> restored comments as per Andrey's feedback Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> restored comments as per Andrey's feedback Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed up comments Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed up comments Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> restored comments as per Andrey's feedback Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> fixed up comments Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com> adding wheel installation Signed-off-by: Vikas Saxena <Vikas.Saxena.2006@gmail.com>
diff --git a/cmd/earlystopping/medianstop/v1beta1/Dockerfile b/cmd/earlystopping/medianstop/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${EARLY_STOPPING_DIR}/ ${TARGET_DIR}/${EARLY_STOPPING_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${EARLY_STOPPING_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile b/cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile
@@ -17,6 +17,8 @@ RUN if [ "${TARGETARCH}" = "arm64" ]; then \
     rm -rf /var/lib/apt/lists/*; \
     fi
 
+RUN python -m pip install --upgrade pip \
+    && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile.ppc64le b/cmd/metricscollector/v1beta1/tfevent-metricscollector/Dockerfile.ppc64le
@@ -1,6 +1,8 @@
 FROM ibmcom/tensorflow-ppc64le:2.2.0-py3
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/metricscollector/v1beta1/tfevent-metricscollector/
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/apis/manager/v1beta1/python:/usr/src/app/github.com/kubeflow/katib/pkg/metricscollector/v1beta1/tfevent-metricscollector/:/usr/src/app/github.com/kubeflow/katib/pkg/metricscollector/v1beta1/common/
 ENTRYPOINT ["python", "main.py"]
diff --git a/cmd/suggestion/hyperband/v1beta1/Dockerfile b/cmd/suggestion/hyperband/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/hyperopt/v1beta1/Dockerfile b/cmd/suggestion/hyperopt/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/nas/darts/v1beta1/Dockerfile b/cmd/suggestion/nas/darts/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/nas/enas/v1beta1/Dockerfile b/cmd/suggestion/nas/enas/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/optuna/v1beta1/Dockerfile b/cmd/suggestion/optuna/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/pbt/v1beta1/Dockerfile b/cmd/suggestion/pbt/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/cmd/suggestion/skopt/v1beta1/Dockerfile b/cmd/suggestion/skopt/v1beta1/Dockerfile
@@ -17,6 +17,8 @@ ADD ./${SUGGESTION_DIR}/ ${TARGET_DIR}/${SUGGESTION_DIR}/
 
 WORKDIR  ${TARGET_DIR}/${SUGGESTION_DIR}
 
+RUN python -m pip install --upgrade pip \
+     && pip install wheel
 RUN pip install --prefer-binary --no-cache-dir -r requirements.txt
 RUN chgrp -R 0 ${TARGET_DIR} \
   && chmod -R g+rwX ${TARGET_DIR}
diff --git a/manifests/v1beta1/components/webhook/webhooks.yaml b/manifests/v1beta1/components/webhook/webhooks.yaml
@@ -3,6 +3,8 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: katib.kubeflow.org
+  annotations:
+    cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER
 webhooks:
   - name: validator.experiment.katib.kubeflow.org
     sideEffects: None
@@ -28,6 +30,8 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: katib.kubeflow.org
+  annotations:
+    cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER
 webhooks:
   - name: defaulter.experiment.katib.kubeflow.org
     sideEffects: None
diff --git a/manifests/v1beta1/installs/katib-cert-manager/certificate.yaml b/manifests/v1beta1/installs/katib-cert-manager/certificate.yaml
@@ -5,10 +5,10 @@ metadata:
   name: katib-webhook-cert
 spec:
   isCA: true
-  commonName: $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc
+  commonName: KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc
   dnsNames:
-    - $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc
-    - $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc.cluster.local
+    - KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc
+    - KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: katib-selfsigned-issuer
diff --git a/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml b/manifests/v1beta1/installs/katib-cert-manager/kustomization.yaml
@@ -1,24 +1,23 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  # Namespace.
-  - ../../components/namespace
-  # Katib controller.
-  - ../../components/controller/
-  # Katib CRDs.
-  - ../../components/crd/
-  # Katib DB manager.
-  - ../../components/db-manager/
-  # Katib DB mysql.
-  - ../../components/mysql/
-  # Katib UI.
-  - ../../components/ui/
-  # Katib webhooks.
-  - ../../components/webhook/
-  # Cert-manager certificate for webhooks
-  - certificate.yaml
+# Namespace.
+- ../../components/namespace
+# Katib controller.
+- ../../components/controller/
+# Katib CRDs.
+- ../../components/crd/
+# Katib DB manager.
+- ../../components/db-manager/
+# Katib DB mysql.
+- ../../components/mysql/
+# Katib UI.
+- ../../components/ui/
+# Katib webhooks.
+- ../../components/webhook/
+# Cert-manager certificate for webhooks
+- certificate.yaml
 images:
   - name: ghcr.io/kubeflow/katib/katib-controller
     newName: ghcr.io/kubeflow/katib/katib-controller
@@ -30,40 +29,123 @@ images:
     newName: ghcr.io/kubeflow/katib/katib-ui
     newTag: latest
 
-patchesStrategicMerge:
-  - patches/katib-cert-injection.yaml
 
-vars:
-  - fieldref:
-      fieldPath: metadata.namespace
-    name: KATIB_NAMESPACE
-    objref:
-      apiVersion: v1
-      kind: Service
-      name: katib-controller
-  - fieldref:
-      fieldPath: metadata.name
-    name: KATIB_SERVICE_NAME
-    objref:
-      apiVersion: v1
-      kind: Service
-      name: katib-controller
-  - name: KATIB_CERT_NAME
-    objref:
-      kind: Certificate
-      group: cert-manager.io
-      version: v1
-      name: katib-webhook-cert
-    fieldref:
-      fieldpath: metadata.name
 
 configurations:
-  - params.yaml
+- params.yaml
 
 configMapGenerator:
-  - name: katib-config
-    behavior: create
-    files:
-      - katib-config.yaml
+- behavior: create
+  files:
+  - katib-config.yaml
+  name: katib-config
+  options:
+    disableNameSuffixHash: true
+
+replacements:
+- source:
+    fieldPath: metadata.namespace
+    kind: Service
+    name: katib-controller
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.commonName
+    options:
+      delimiter: .
+      index: 1
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+  - fieldPaths:
+    - spec.dnsNames.0
+    options:
+      delimiter: .
+      index: 1
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+  - fieldPaths:
+    - spec.dnsNames.1
+    options:
+      delimiter: .
+      index: 1
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+  - fieldPaths:
+    - metadata.annotations.cert-manager\.io/inject-ca-from
+    options:
+      delimiter: /
+      index: 0
+    select:
+      kind: ValidatingWebhookConfiguration
+      name: katib.kubeflow.org
+  - fieldPaths:
+    - metadata.annotations.cert-manager\.io/inject-ca-from
+    options:
+      delimiter: /
+      index: 0
+    select:
+      kind: MutatingWebhookConfiguration
+      name: katib.kubeflow.org
+- source:
+    fieldPath: metadata.name
+    kind: Service
+    name: katib-controller
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.commonName
+    options:
+      delimiter: .
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+  - fieldPaths:
+    - spec.dnsNames.0
+    options:
+      delimiter: .
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+  - fieldPaths:
+    - spec.dnsNames.1
+    options:
+      delimiter: .
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      name: katib-webhook-cert
+      version: v1
+- source:
+    fieldPath: metadata.name
+    kind: Certificate
+    name: katib-webhook-cert
+  targets:
+  - fieldPaths:
+    - metadata.annotations.cert-manager\.io/inject-ca-from
+    options:
+      delimiter: /
+      index: 1
+    select:
+      kind: ValidatingWebhookConfiguration
+      name: katib.kubeflow.org
+  - fieldPaths:
+    - metadata.annotations.cert-manager\.io/inject-ca-from
     options:
-      disableNameSuffixHash: true
+      delimiter: /
+      index: 1
+    select:
+      kind: MutatingWebhookConfiguration
+      name: katib.kubeflow.org
diff --git a/manifests/v1beta1/installs/katib-cert-manager/params.yaml b/manifests/v1beta1/installs/katib-cert-manager/params.yaml
@@ -6,9 +6,9 @@ varReference:
     kind: Certificate
   - path: spec/issuerRef/name
     kind: Certificate
-  - path: metadata/annotations
+  - path: metadata.annotations.cert-manager.io/inject-ca-from
     kind: MutatingWebhookConfiguration
-  - path: metadata/annotations
+  - path: metadata.annotations.cert-manager.io/inject-ca-from
     kind: ValidatingWebhookConfiguration
 nameReference:
   - kind: Issuer
diff --git a/manifests/v1beta1/installs/katib-cert-manager/patches/katib-cert-injection.yaml b/manifests/v1beta1/installs/katib-cert-manager/patches/katib-cert-injection.yaml
diff --git a/manifests/v1beta1/installs/katib-external-db/kustomization.yaml b/manifests/v1beta1/installs/katib-external-db/kustomization.yaml
diff --git a/manifests/v1beta1/installs/katib-openshift/kustomization.yaml b/manifests/v1beta1/installs/katib-openshift/kustomization.yaml
diff --git a/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml b/manifests/v1beta1/installs/katib-standalone-postgres/kustomization.yaml
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/kustomization.yaml
diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/ui-virtual-service.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/ui-virtual-service.yaml
