diff --git a/.github/workflows/katib_test.yaml b/.github/workflows/katib_test.yaml index 21879a87ca..762f983a06 100644 --- a/.github/workflows/katib_test.yaml +++ b/.github/workflows/katib_test.yaml @@ -23,7 +23,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 + + - name: Free up disk space + run: ./tests/free-disk-space.sh - name: Install KinD, Create KinD cluster and Install kustomize run: ./tests/install_KinD_create_KinD_cluster_install_kustomize.sh @@ -55,10 +58,6 @@ jobs: - name: Install Katib run: ./tests/katib_install.sh - - - name: Install Dependencies - run: pip install pytest kubernetes kfp==2.13.0 requests - - name: Port-forward the istio-ingress gateway run: ./tests/port_forward_gateway.sh diff --git a/README.md b/README.md index 16ce1a5f2f..eea1a44e53 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ This repository periodically synchronizes all official Kubeflow components from | Jupyter Web Application | applications/jupyter/jupyter-web-app/upstream | [v1.10.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0/components/crud-web-apps/jupyter/manifests) | 4m | 231Mi | 0GB | | Tensorboards Web Application | applications/tensorboard/tensorboards-web-app/upstream | [v1.10.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0/components/crud-web-apps/tensorboards/manifests) | | | | | Volumes Web Application | applications/volumes-web-app/upstream | [v1.10.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0/components/crud-web-apps/volumes/manifests) | 4m | 226Mi | 0GB | -| Katib | applications/katib/upstream | [v0.18.0](https://github.com/kubeflow/katib/tree/v0.18.0/manifests/v1beta1) | 13m | 476Mi | 10GB | +| Katib | applications/katib/upstream | [v0.19.0](https://github.com/kubeflow/katib/tree/v0.19.0/manifests/v1beta1) | 13m | 476Mi | 10GB | | KServe | applications/kserve/kserve | [v0.15.0](https://github.com/kserve/kserve/releases/tag/v0.15.0/install/v0.15.0) | 600m | 1200Mi | 0GB | | KServe Models Web Application | applications/kserve/models-web-app | [v0.15.0](https://github.com/kserve/models-web-app/tree/v0.15.0/config) | 6m | 259Mi | 0GB | | Kubeflow Pipelines | applications/pipeline/upstream | [2.15.0](https://github.com/kubeflow/pipelines/tree/2.15.0/manifests/kustomize) | 970m | 3552Mi | 35GB | diff --git a/applications/katib/upstream/components/controller/rbac.yaml b/applications/katib/upstream/components/controller/rbac.yaml index ccc867a2ee..6a62becf92 100644 --- a/applications/katib/upstream/components/controller/rbac.yaml +++ b/applications/katib/upstream/components/controller/rbac.yaml @@ -91,15 +91,23 @@ rules: - "create" - "delete" - apiGroups: - - trainer.kubeflow.org + - jobset.x-k8s.io resources: - - trainjobs + - jobsets verbs: - - "get" - - "list" - - "watch" - - "create" - - "delete" + - "get" + - "list" + - "watch" + - apiGroups: + - trainer.kubeflow.org + resources: + - trainjobs + verbs: + - "create" + - "get" + - "list" + - "watch" + - "delete" - apiGroups: - kubeflow.org resources: diff --git a/applications/katib/upstream/components/controller/trial-templates.yaml b/applications/katib/upstream/components/controller/trial-templates.yaml index 1b0f3bba2e..8387e3ec9a 100644 --- a/applications/katib/upstream/components/controller/trial-templates.yaml +++ b/applications/katib/upstream/components/controller/trial-templates.yaml @@ -15,7 +15,7 @@ data: spec: containers: - name: training-container - image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.18.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.19.0 command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -33,7 +33,7 @@ data: spec: containers: - name: training-container - image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu:v0.18.0 + image: ghcr.io/kubeflow/katib/enas-cnn-cifar10-cpu:v0.19.0 command: - python3 - -u @@ -54,7 +54,7 @@ data: spec: containers: - name: pytorch - image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.18.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.19.0 command: - "python3" - "/opt/pytorch-mnist/mnist.py" @@ -68,7 +68,7 @@ data: spec: containers: - name: pytorch - image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.18.0 + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.19.0 command: - "python3" - "/opt/pytorch-mnist/mnist.py" diff --git a/applications/katib/upstream/components/ui/ui.yaml b/applications/katib/upstream/components/ui/ui.yaml index f836f976a9..00bc0a3441 100644 --- a/applications/katib/upstream/components/ui/ui.yaml +++ b/applications/katib/upstream/components/ui/ui.yaml @@ -17,9 +17,6 @@ spec: katib.kubeflow.org/component: ui sidecar.istio.io/inject: "false" spec: - securityContext: - seccompProfile: - type: RuntimeDefault containers: - name: katib-ui image: ghcr.io/kubeflow/katib/katib-ui @@ -39,6 +36,8 @@ spec: runAsNonRoot: true allowPrivilegeEscalation: false runAsUser: 1000 + seccompProfile: + type: RuntimeDefault capabilities: drop: - ALL diff --git a/applications/katib/upstream/installs/katib-cert-manager/certificate.yaml b/applications/katib/upstream/installs/katib-cert-manager/certificate.yaml index cdd7b41b52..8132867e3a 100644 --- a/applications/katib/upstream/installs/katib-cert-manager/certificate.yaml +++ b/applications/katib/upstream/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/applications/katib/upstream/installs/katib-cert-manager/katib-config.yaml b/applications/katib/upstream/installs/katib-cert-manager/katib-config.yaml index a97d2887c5..81e7f4c391 100644 --- a/applications/katib/upstream/installs/katib-cert-manager/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-cert-manager/katib-config.yaml @@ -5,6 +5,7 @@ init: controller: webhookPort: 8443 trialResources: + - TrainJob.v1alpha1.trainer.kubeflow.org - Job.v1.batch - TFJob.v1.kubeflow.org - PyTorchJob.v1.kubeflow.org @@ -13,40 +14,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -55,4 +56,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-cert-manager/kustomization.yaml b/applications/katib/upstream/installs/katib-cert-manager/kustomization.yaml index d4296a12fe..41ae7d6b77 100644 --- a/applications/katib/upstream/installs/katib-cert-manager/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-cert-manager/kustomization.yaml @@ -1,69 +1,158 @@ ---- 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 - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-db-manager - newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-ui - newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 +- name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: v0.19.0 -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 +patches: +- path: patches/katib-cert-injection.yaml +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: / + create: true + select: + group: admissionregistration.k8s.io + kind: ValidatingWebhookConfiguration + version: v1 + - fieldPaths: + - metadata.annotations.[cert-manager.io/inject-ca-from] options: - disableNameSuffixHash: true + delimiter: / + create: true + select: + group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + version: v1 +- 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 + create: true + select: + group: admissionregistration.k8s.io + kind: ValidatingWebhookConfiguration + version: v1 + - fieldPaths: + - metadata.annotations.[cert-manager.io/inject-ca-from] + options: + delimiter: / + index: 1 + create: true + select: + group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + version: v1 diff --git a/applications/katib/upstream/installs/katib-cert-manager/patches/katib-cert-injection.yaml b/applications/katib/upstream/installs/katib-cert-manager/patches/katib-cert-injection.yaml index ec259194e0..e5b03ce8af 100644 --- a/applications/katib/upstream/installs/katib-cert-manager/patches/katib-cert-injection.yaml +++ b/applications/katib/upstream/installs/katib-cert-manager/patches/katib-cert-injection.yaml @@ -4,11 +4,11 @@ kind: ValidatingWebhookConfiguration metadata: name: katib.kubeflow.org annotations: - cert-manager.io/inject-ca-from: $(KATIB_NAMESPACE)/$(KATIB_CERT_NAME) + cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: name: katib.kubeflow.org annotations: - cert-manager.io/inject-ca-from: $(KATIB_NAMESPACE)/$(KATIB_CERT_NAME) + cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER diff --git a/applications/katib/upstream/installs/katib-external-db/katib-config.yaml b/applications/katib/upstream/installs/katib-external-db/katib-config.yaml index f4d5226e32..b57861f515 100644 --- a/applications/katib/upstream/installs/katib-external-db/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-external-db/katib-config.yaml @@ -15,40 +15,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -57,4 +57,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-external-db/kustomization.yaml b/applications/katib/upstream/installs/katib-external-db/kustomization.yaml index 3e9667188a..724f2f6e85 100644 --- a/applications/katib/upstream/installs/katib-external-db/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-external-db/kustomization.yaml @@ -1,45 +1,44 @@ ---- 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 UI. - - ../../components/ui/ - # Katib webhooks. - - ../../components/webhook/ +# Namespace. +- ../../components/namespace/ +# Katib controller. +- ../../components/controller/ +# Katib CRDs. +- ../../components/crd/ +# Katib DB manager. +- ../../components/db-manager/ +# Katib UI. +- ../../components/ui/ +# Katib webhooks. +- ../../components/webhook/ images: - - name: ghcr.io/kubeflow/katib/katib-controller - newName: ghcr.io/kubeflow/katib/katib-controller - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-db-manager - newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-ui - newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 -patchesStrategicMerge: - - patches/db-manager.yaml +- name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: v0.19.0 # Modify katib-mysql-secrets with parameters for the DB. -secretGenerator: - - name: katib-mysql-secrets - envs: - - secrets.env # Secret for webhooks certs. - - name: katib-webhook-cert - options: - disableNameSuffixHash: true +secretGenerator: +- envs: + - secrets.env + name: katib-mysql-secrets +- name: katib-webhook-cert + options: + disableNameSuffixHash: true configMapGenerator: - - name: katib-config - behavior: create - files: - - katib-config.yaml - options: - disableNameSuffixHash: true +- behavior: create + files: + - katib-config.yaml + name: katib-config + options: + disableNameSuffixHash: true +patches: +- path: patches/db-manager.yaml diff --git a/applications/katib/upstream/installs/katib-leader-election/katib-config.yaml b/applications/katib/upstream/installs/katib-leader-election/katib-config.yaml index 5e4bcfafe1..981c92067b 100644 --- a/applications/katib/upstream/installs/katib-leader-election/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-leader-election/katib-config.yaml @@ -16,40 +16,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -58,4 +58,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-leader-election/kustomization.yaml b/applications/katib/upstream/installs/katib-leader-election/kustomization.yaml index 64b8a1554b..a8c7d3dd51 100644 --- a/applications/katib/upstream/installs/katib-leader-election/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-leader-election/kustomization.yaml @@ -1,18 +1,17 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kubeflow -resources: - - ../katib-standalone # rbac for leader-election - - leader-election-rbac.yaml +resources: +- ../katib-standalone +- leader-election-rbac.yaml replicas: - - name: katib-controller - count: 2 +- count: 2 + name: katib-controller configMapGenerator: - - name: katib-config - behavior: replace - files: - - katib-config.yaml - options: - disableNameSuffixHash: true +- behavior: replace + files: + - katib-config.yaml + name: katib-config + options: + disableNameSuffixHash: true diff --git a/applications/katib/upstream/installs/katib-openshift/katib-config.yaml b/applications/katib/upstream/installs/katib-openshift/katib-config.yaml index a97d2887c5..019e4345ca 100644 --- a/applications/katib/upstream/installs/katib-openshift/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-openshift/katib-config.yaml @@ -13,40 +13,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -55,4 +55,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-openshift/kustomization.yaml b/applications/katib/upstream/installs/katib-openshift/kustomization.yaml index f384b556c3..c24b3accef 100644 --- a/applications/katib/upstream/installs/katib-openshift/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-openshift/kustomization.yaml @@ -8,65 +8,62 @@ # To achieve this, run: # # `kustomize build ./manifests/v1beta1/installs/katib-openshift | oc apply -f - -l type!=local` ---- 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/ +# 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/ images: - - name: ghcr.io/kubeflow/katib/katib-controller - newName: ghcr.io/kubeflow/katib/katib-controller - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-db-manager - newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-ui - newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 - -patchesJson6902: - # Annotate Service to delegate TLS-secret generation to OpenShift service controller - # https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html#add-service-certificate_service-serving-certificate - - target: - group: "" - version: v1 - kind: Service - name: katib-controller - namespace: kubeflow - path: patches/service-serving-cert.yaml - # Annotate WebhookConfigurations to delegate `caBundle` population to OpenShift service controller - # https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html#add-service-certificate-mutating-webhook_service-serving-certificate - - target: - group: admissionregistration.k8s.io - version: v1 - kind: ValidatingWebhookConfiguration - name: katib.kubeflow.org - path: patches/webhook-inject-cabundle.yaml - - target: - group: admissionregistration.k8s.io - version: v1 - kind: MutatingWebhookConfiguration - name: katib.kubeflow.org - path: patches/webhook-inject-cabundle.yaml +- name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: v0.19.0 configMapGenerator: - - name: katib-config - behavior: create - files: - - katib-config.yaml - options: - disableNameSuffixHash: true +- behavior: create + files: + - katib-config.yaml + name: katib-config + options: + disableNameSuffixHash: true +patches: +# Annotate Service to delegate TLS-secret generation to OpenShift service controller +# https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html#add-service-certificate_service-serving-certificate +- path: patches/service-serving-cert.yaml + target: + kind: Service + name: katib-controller + namespace: kubeflow + version: v1 + # Annotate WebhookConfigurations to delegate `caBundle` population to OpenShift service controller +# https://docs.openshift.com/container-platform/4.6/security/certificates/service-serving-certificate.html#add-service-certificate-mutating-webhook_service-serving-certificate +- path: patches/webhook-inject-cabundle.yaml + target: + group: admissionregistration.k8s.io + kind: ValidatingWebhookConfiguration + name: katib.kubeflow.org + version: v1 +- path: patches/webhook-inject-cabundle.yaml + target: + group: admissionregistration.k8s.io + kind: MutatingWebhookConfiguration + name: katib.kubeflow.org + version: v1 diff --git a/applications/katib/upstream/installs/katib-standalone-postgres/katib-config.yaml b/applications/katib/upstream/installs/katib-standalone-postgres/katib-config.yaml index f4d5226e32..b57861f515 100644 --- a/applications/katib/upstream/installs/katib-standalone-postgres/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-standalone-postgres/katib-config.yaml @@ -15,40 +15,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -57,4 +57,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-standalone-postgres/kustomization.yaml b/applications/katib/upstream/installs/katib-standalone-postgres/kustomization.yaml index 7e7a105703..2d1f7fbbf7 100644 --- a/applications/katib/upstream/installs/katib-standalone-postgres/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-standalone-postgres/kustomization.yaml @@ -1,48 +1,47 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: kubeflow +namespace: kubeflow resources: - # Namespace. - - ../../components/namespace/ - # Katib controller. - - ../../components/controller/ - # Katib CRDs. - - ../../components/crd/ - # Katib DB manager. - - ../../components/db-manager/ - # Katib DB postgres. - - ../../components/postgres/ - # Katib UI. - - ../../components/ui/ - # Katib webhooks. - - ../../components/webhook/ +# Namespace. +- ../../components/namespace/ +# Katib controller. +- ../../components/controller/ +# Katib CRDs. +- ../../components/crd/ +# Katib DB manager. +- ../../components/db-manager/ +# Katib DB postgres. +- ../../components/postgres/ +# Katib UI. +- ../../components/ui/ +# Katib webhooks. +- ../../components/webhook/ images: - - name: ghcr.io/kubeflow/katib/katib-controller - newName: ghcr.io/kubeflow/katib/katib-controller - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-db-manager - newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-ui - newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 -patchesJson6902: - - target: - group: apps - version: v1 - kind: Deployment - name: katib-db-manager - path: ./patches/db-manager.yaml +- name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: v0.19.0 configMapGenerator: - - name: katib-config - behavior: create - files: - - katib-config.yaml - options: - disableNameSuffixHash: true +- behavior: create + files: + - katib-config.yaml + name: katib-config + options: + disableNameSuffixHash: true # Secret for webhooks certs. secretGenerator: - - name: katib-webhook-cert - options: - disableNameSuffixHash: true +- name: katib-webhook-cert + options: + disableNameSuffixHash: true +patches: +- path: ./patches/db-manager.yaml + target: + group: apps + kind: Deployment + name: katib-db-manager + version: v1 diff --git a/applications/katib/upstream/installs/katib-standalone/katib-config.yaml b/applications/katib/upstream/installs/katib-standalone/katib-config.yaml index da9736f573..666fbc87f3 100644 --- a/applications/katib/upstream/installs/katib-standalone/katib-config.yaml +++ b/applications/katib/upstream/installs/katib-standalone/katib-config.yaml @@ -6,6 +6,7 @@ init: controller: webhookPort: 8443 trialResources: + - TrainJob.v1alpha1.trainer.kubeflow.org - Job.v1.batch - TFJob.v1.kubeflow.org - PyTorchJob.v1.kubeflow.org @@ -14,40 +15,40 @@ init: runtime: metricsCollectors: - kind: StdOut - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: File - image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/file-metrics-collector:v0.19.0 - kind: TensorFlowEvent - image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.18.0 + image: ghcr.io/kubeflow/katib/tfevent-metrics-collector:v0.19.0 resources: limits: memory: 1Gi suggestions: - algorithmName: random - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: tpe - image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperopt:v0.19.0 - algorithmName: grid - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: hyperband - image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-hyperband:v0.19.0 - algorithmName: bayesianoptimization - image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-skopt:v0.19.0 - algorithmName: cmaes - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: sobol - image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-goptuna:v0.19.0 - algorithmName: multivariate-tpe - image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-optuna:v0.19.0 - algorithmName: enas - image: ghcr.io/kubeflow/katib/suggestion-enas:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-enas:v0.19.0 resources: limits: memory: 400Mi - algorithmName: darts - image: ghcr.io/kubeflow/katib/suggestion-darts:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-darts:v0.19.0 - algorithmName: pbt - image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.18.0 + image: ghcr.io/kubeflow/katib/suggestion-pbt:v0.19.0 persistentVolumeClaimSpec: accessModes: - ReadWriteMany @@ -56,4 +57,4 @@ runtime: storage: 5Gi earlyStoppings: - algorithmName: medianstop - image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.18.0 + image: ghcr.io/kubeflow/katib/earlystopping-medianstop:v0.19.0 diff --git a/applications/katib/upstream/installs/katib-standalone/kustomization.yaml b/applications/katib/upstream/installs/katib-standalone/kustomization.yaml index 9882be63d2..166c7bd002 100644 --- a/applications/katib/upstream/installs/katib-standalone/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-standalone/kustomization.yaml @@ -20,13 +20,13 @@ resources: images: - name: ghcr.io/kubeflow/katib/katib-controller newName: ghcr.io/kubeflow/katib/katib-controller - newTag: v0.18.0 + newTag: v0.19.0 - name: ghcr.io/kubeflow/katib/katib-db-manager newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 + newTag: v0.19.0 - name: ghcr.io/kubeflow/katib/katib-ui newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 + newTag: v0.19.0 configMapGenerator: - name: katib-config behavior: create diff --git a/applications/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml b/applications/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml index a1ab26aa90..91d6026472 100644 --- a/applications/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml +++ b/applications/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml @@ -1,56 +1,63 @@ ---- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kubeflow resources: - - ../katib-cert-manager - # Kubeflow Katib components. - - kubeflow-katib-roles.yaml - - ui-virtual-service.yaml - - istio-authorizationpolicy.yaml +- ../katib-cert-manager +# Kubeflow Katib components. +- kubeflow-katib-roles.yaml +- ui-virtual-service.yaml +- istio-authorizationpolicy.yaml images: - - name: ghcr.io/kubeflow/katib/katib-controller - newName: ghcr.io/kubeflow/katib/katib-controller - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-db-manager - newName: ghcr.io/kubeflow/katib/katib-db-manager - newTag: v0.18.0 - - name: ghcr.io/kubeflow/katib/katib-ui - newName: ghcr.io/kubeflow/katib/katib-ui - newTag: v0.18.0 - -patchesStrategicMerge: - - patches/remove-namespace.yaml - +- name: ghcr.io/kubeflow/katib/katib-controller + newName: ghcr.io/kubeflow/katib/katib-controller + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-db-manager + newName: ghcr.io/kubeflow/katib/katib-db-manager + newTag: v0.19.0 +- name: ghcr.io/kubeflow/katib/katib-ui + newName: ghcr.io/kubeflow/katib/katib-ui + newTag: v0.19.0 + patches: - # Extend RBAC permission list of katib-ui so it can - # create SubjectAccessReview resources. - - target: - kind: ClusterRole - name: katib-ui - group: rbac.authorization.k8s.io - version: v1 - path: patches/ui-rbac.yaml - # Enable RBAC authz checks in UI's backend. - - target: - version: v1 - kind: Deployment - name: katib-ui - path: patches/enable-ui-authz-checks.yaml - # Allow istio sidecar injection in katib-UI Pod. - - target: - kind: Deployment - name: katib-ui - path: patches/istio-sidecar-injection.yaml +# Extend RBAC permission list of katib-ui so it can +# create SubjectAccessReview resources. +- path: patches/ui-rbac.yaml + target: + group: rbac.authorization.k8s.io + kind: ClusterRole + name: katib-ui + version: v1 +# Enable RBAC authz checks in UI's backend. +- path: patches/enable-ui-authz-checks.yaml + target: + kind: Deployment + name: katib-ui + version: v1 +# Allow istio sidecar injection in katib-UI Pod. +- path: patches/istio-sidecar-injection.yaml + target: + kind: Deployment + name: katib-ui +- path: patches/remove-namespace.yaml -vars: - - fieldref: - fieldPath: metadata.namespace - name: KATIB_UI_NAMESPACE - objref: - apiVersion: apps/v1 - kind: Deployment - name: katib-ui configurations: - - params.yaml +- params.yaml +replacements: +- source: + fieldPath: metadata.namespace + group: apps + kind: Deployment + name: katib-ui + version: v1 + targets: + - fieldPaths: + - spec.http.0.route.0.destination.host + options: + delimiter: . + index: 1 + select: + group: networking.istio.io + kind: VirtualService + name: katib-ui + version: v1alpha3 diff --git a/applications/katib/upstream/installs/katib-with-kubeflow/ui-virtual-service.yaml b/applications/katib/upstream/installs/katib-with-kubeflow/ui-virtual-service.yaml index 4ed0f3d1b5..fec5aa06c2 100644 --- a/applications/katib/upstream/installs/katib-with-kubeflow/ui-virtual-service.yaml +++ b/applications/katib/upstream/installs/katib-with-kubeflow/ui-virtual-service.yaml @@ -16,6 +16,6 @@ spec: uri: /katib/ route: - destination: - host: katib-ui.$(KATIB_UI_NAMESPACE).svc.cluster.local + host: katib-ui.KATIB_UI_NAMESPACE_PLACEHOLDER.svc.cluster.local port: number: 80 diff --git a/scripts/synchronize-katib-manifests.sh b/scripts/synchronize-katib-manifests.sh index cd80ffe787..be3e90e7dc 100644 --- a/scripts/synchronize-katib-manifests.sh +++ b/scripts/synchronize-katib-manifests.sh @@ -9,7 +9,7 @@ setup_error_handling COMPONENT_NAME="katib" REPOSITORY_NAME="kubeflow/katib" REPOSITORY_URL="https://github.com/kubeflow/katib.git" -COMMIT="v0.18.0" +COMMIT="v0.19.0" REPOSITORY_DIRECTORY="katib" SOURCE_DIRECTORY=${SOURCE_DIRECTORY:=/tmp/kubeflow-${COMPONENT_NAME}} BRANCH_NAME=${BRANCH_NAME:=synchronize-${COMPONENT_NAME}-manifests-${COMMIT?}} diff --git a/tests/katib_test.sh b/tests/katib_test.sh index 42e941a179..cfc11fc901 100755 --- a/tests/katib_test.sh +++ b/tests/katib_test.sh @@ -8,5 +8,5 @@ kubectl wait --for=condition=Running experiments.kubeflow.org -n $KF_PROFILE --a echo "Waiting for all Trials to be Completed..." kubectl wait --for=condition=Created trials.kubeflow.org -n $KF_PROFILE --all --timeout=60s kubectl get trials.kubeflow.org -n $KF_PROFILE -kubectl wait --for=condition=Succeeded trials.kubeflow.org -n $KF_PROFILE --all --timeout 900s +kubectl wait --for=condition=Succeeded trials.kubeflow.org -n $KF_PROFILE --all --timeout 600s kubectl get trials.kubeflow.org -n $KF_PROFILE diff --git a/tests/katib_test.yaml b/tests/katib_test.yaml index 7635ab0066..e369c5f559 100644 --- a/tests/katib_test.yaml +++ b/tests/katib_test.yaml @@ -1,5 +1,3 @@ ---- ---- apiVersion: kubeflow.org/v1beta1 kind: Experiment metadata: @@ -48,7 +46,7 @@ spec: spec: containers: - name: training-container - image: docker.io/kubeflowkatib/pytorch-mnist-cpu:latest + image: ghcr.io/kubeflow/katib/pytorch-mnist-cpu:v0.19.0 command: - "python3" - "/opt/pytorch-mnist/mnist.py"