Update kubeflow/katib manifests from v0.13.0-rc.0 (#2116)

2022-01-26 23:52:10 +02:00 · 2022-01-26 23:52:10 +02:00 · bcc0e4f8bd
parent 105846262d
commit bcc0e4f8bd
17 changed files with 96 additions and 67 deletions
--- a/apps/katib/upstream/components/cert-generator/cert-generator.yaml
+++ b/apps/katib/upstream/components/cert-generator/cert-generator.yaml
@ -16,6 +16,8 @@ spec:
        - name: cert-generator
          image: docker.io/kubeflowkatib/cert-generator
          imagePullPolicy: Always
+          command: ["./katib-cert-generator"]
+          args: ["generate", "--namespace=$(KATIB_CORE_NAMESPACE)"]
          env:
            - name: KATIB_CORE_NAMESPACE
              valueFrom:
--- a/apps/katib/upstream/components/cert-generator/rbac.yaml
+++ b/apps/katib/upstream/components/cert-generator/rbac.yaml
@ -25,28 +25,6 @@ rules:
    verbs:
      - get
      - patch
-  - apiGroups:
-      - certificates.k8s.io
-    resources:
-      - certificatesigningrequests
-    verbs:
-      - get
-      - create
-      - delete
-  - apiGroups:
-      - certificates.k8s.io
-    resources:
-      - certificatesigningrequests/approval
-    verbs:
-      - update
-  - apiGroups:
-      - certificates.k8s.io
-    resources:
-      - signers
-    resourceNames:
-      - kubernetes.io/*
-    verbs:
-      - approve
 ---
 apiVersion: v1
 kind: ServiceAccount
--- a/apps/katib/upstream/components/controller/controller.yaml
+++ b/apps/katib/upstream/components/controller/controller.yaml
@ -16,6 +16,7 @@ spec:
        katib.kubeflow.org/component: controller
      annotations:
        prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
        sidecar.istio.io/inject: "false"
    spec:
      serviceAccountName: katib-controller
@ -30,6 +31,7 @@ spec:
            - "--trial-resources=PyTorchJob.v1.kubeflow.org"
            - "--trial-resources=MPIJob.v1.kubeflow.org"
            - "--trial-resources=XGBoostJob.v1.kubeflow.org"
+            - "--trial-resources=MXJob.v1.kubeflow.org"
          ports:
            - containerPort: 8443
              name: webhook
--- a/apps/katib/upstream/components/controller/katib-config.yaml
+++ b/apps/katib/upstream/components/controller/katib-config.yaml
@ -7,13 +7,13 @@ data:
  metrics-collector-sidecar: |-
    {
      "StdOut": {
-        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.12.0"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.13.0-rc.0"
      },
      "File": {
-        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.12.0"
+        "image": "docker.io/kubeflowkatib/file-metrics-collector:v0.13.0-rc.0"
      },
      "TensorFlowEvent": {
-        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.12.0",
+        "image": "docker.io/kubeflowkatib/tfevent-metrics-collector:v0.13.0-rc.0",
        "resources": {
          "limits": {
            "memory": "1Gi"
@ -24,31 +24,31 @@ data:
  suggestion: |-
    {
      "random": {
-        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.13.0-rc.0"
      },
      "tpe": {
-        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperopt:v0.13.0-rc.0"
      },
      "grid": {
-        "image": "docker.io/kubeflowkatib/suggestion-chocolate:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-chocolate:v0.13.0-rc.0"
      },
      "hyperband": {
-        "image": "docker.io/kubeflowkatib/suggestion-hyperband:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-hyperband:v0.13.0-rc.0"
      },
      "bayesianoptimization": {
-        "image": "docker.io/kubeflowkatib/suggestion-skopt:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-skopt:v0.13.0-rc.0"
      },
      "cmaes": {
-        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.13.0-rc.0"
      },
      "sobol": {
-        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-goptuna:v0.13.0-rc.0"
      },
      "multivariate-tpe": {
-        "image": "docker.io/kubeflowkatib/suggestion-optuna:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-optuna:v0.13.0-rc.0"
      },
      "enas": {
-        "image": "docker.io/kubeflowkatib/suggestion-enas:v0.12.0",
+        "image": "docker.io/kubeflowkatib/suggestion-enas:v0.13.0-rc.0",
        "resources": {
          "limits": {
            "memory": "200Mi"
@ -56,12 +56,12 @@ data:
        }
      },
      "darts": {
-        "image": "docker.io/kubeflowkatib/suggestion-darts:v0.12.0"
+        "image": "docker.io/kubeflowkatib/suggestion-darts:v0.13.0-rc.0"
      }
    }
  early-stopping: |-
    {
      "medianstop": {
-        "image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.12.0"
+        "image": "docker.io/kubeflowkatib/earlystopping-medianstop:v0.13.0-rc.0"
      }
    }
--- a/apps/katib/upstream/components/controller/rbac.yaml
+++ b/apps/katib/upstream/components/controller/rbac.yaml
@ -16,6 +16,7 @@ rules:
      - pods
      - pods/log
      - pods/status
+      - secrets
    verbs:
      - "*"
  - apiGroups:
@ -54,6 +55,7 @@ rules:
      - pytorchjobs
      - mpijobs
      - xgboostjobs
+      - mxjobs
    verbs:
      - "*"
 ---
--- a/apps/katib/upstream/components/controller/trial-templates.yaml
+++ b/apps/katib/upstream/components/controller/trial-templates.yaml
@ -14,7 +14,7 @@ data:
        spec:
          containers:
            - name: training-container
-              image: docker.io/kubeflowkatib/mxnet-mnist:v1beta1-45c5727
+              image: docker.io/kubeflowkatib/mxnet-mnist:v0.13.0-rc.0
              command:
                - "python3"
                - "/opt/mxnet-mnist/mnist.py"
@ -32,7 +32,7 @@ data:
        spec:
          containers:
            - name: training-container
-              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v1beta1-45c5727
+              image: docker.io/kubeflowkatib/enas-cnn-cifar10-cpu:v0.13.0-rc.0
              command:
                - python3
                - -u
@ -42,7 +42,7 @@ data:
                - "--nn_config=\"${trialParameters.neuralNetworkConfig}\""
          restartPolicy: Never
  pytorchJobTemplate: |-
-    apiVersion: "kubeflow.org/v1"
+    apiVersion: kubeflow.org/v1
    kind: PyTorchJob
    spec:
      pytorchReplicaSpecs:
@ -53,7 +53,7 @@ data:
            spec:
              containers:
                - name: pytorch
-                  image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-45c5727
+                  image: docker.io/kubeflowkatib/pytorch-mnist:v0.13.0-rc.0
                  imagePullPolicy: Always
                  command:
                    - "python3"
@ -68,7 +68,7 @@ data:
            spec:
              containers:
                - name: pytorch
-                  image: docker.io/kubeflowkatib/pytorch-mnist:v1beta1-45c5727
+                  image: docker.io/kubeflowkatib/pytorch-mnist:v0.13.0-rc.0
                  imagePullPolicy: Always
                  command:
                    - "python3"
--- a/apps/katib/upstream/components/namespace/namespace.yaml
+++ b/apps/katib/upstream/components/namespace/namespace.yaml
@ -3,4 +3,4 @@ kind: Namespace
 metadata:
  name: kubeflow
  labels:
-    katib-metricscollector-injection: enabled
+    katib.kubeflow.org/metrics-collector-injection: enabled
--- a/apps/katib/upstream/components/webhook/webhooks.yaml
+++ b/apps/katib/upstream/components/webhook/webhooks.yaml
@ -6,9 +6,8 @@ webhooks:
  - name: validator.experiment.katib.kubeflow.org
    sideEffects: None
    failurePolicy: Ignore
-    # TODO (andreyvelich): Migrate to v1 ?
    admissionReviewVersions:
-      - v1beta1
+      - v1
    clientConfig:
      caBundle: Cg==
      service:
@ -35,7 +34,7 @@ webhooks:
    sideEffects: None
    failurePolicy: Ignore
    admissionReviewVersions:
-      - v1beta1
+      - v1
    clientConfig:
      caBundle: Cg==
      service:
@ -56,7 +55,7 @@ webhooks:
    sideEffects: None
    failurePolicy: Ignore
    admissionReviewVersions:
-      - v1beta1
+      - v1
    clientConfig:
      caBundle: Cg==
      service:
@ -65,7 +64,7 @@ webhooks:
        path: /mutate-pod
    namespaceSelector:
      matchLabels:
-        katib-metricscollector-injection: enabled
+        katib.kubeflow.org/metrics-collector-injection: enabled
    rules:
      - apiGroups:
          - ""
--- a/apps/katib/upstream/installs/katib-cert-manager/certificate.yaml
+++ b/apps/katib/upstream/installs/katib-cert-manager/certificate.yaml
@ -1,4 +1,4 @@
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
  name: katib-webhook-cert
@ -13,7 +13,7 @@ spec:
    name: katib-selfsigned-issuer
  secretName: katib-webhook-cert
 ---
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
  name: katib-selfsigned-issuer
--- a/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml
@ -21,13 +21,13 @@ resources:
 images:
  - name: docker.io/kubeflowkatib/katib-controller
    newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-db-manager
    newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-ui
    newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0

 patchesStrategicMerge:
  - patches/katib-cert-injection.yaml
@ -51,7 +51,7 @@ vars:
    objref:
      kind: Certificate
      group: cert-manager.io
-      version: v1alpha2
+      version: v1
      name: katib-webhook-cert
    fieldref:
      fieldpath: metadata.name
--- a/apps/katib/upstream/installs/katib-external-db/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-external-db/kustomization.yaml
@ -19,16 +19,16 @@ resources:
 images:
  - name: docker.io/kubeflowkatib/katib-controller
    newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-db-manager
    newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-ui
    newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/cert-generator
    newName: docker.io/kubeflowkatib/cert-generator
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
 patchesStrategicMerge:
  - patches/db-manager.yaml
 # Modify katib-mysql-secrets with parameters for the DB.
--- a/apps/katib/upstream/installs/katib-leader-election/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-leader-election/kustomization.yaml
@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: kubeflow
+resources:
+  - ../katib-standalone
+  # rbac for leader-election
+  - leader-election-rbac.yaml
+replicas:
+  - name: katib-controller
+    count: 2
+patchesJson6902:
+  - target:
+      group: apps
+      version: v1
+      kind: Deployment
+      name: katib-controller
+    path: ./patches/controller.yaml
--- a/apps/katib/upstream/installs/katib-leader-election/leader-election-rbac.yaml
+++ b/apps/katib/upstream/installs/katib-leader-election/leader-election-rbac.yaml
@ -0,0 +1,26 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: leader-election
+  namespace: kubeflow
+rules:
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: leader-election
+  namespace: kubeflow
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: leader-election
+subjects:
+  - kind: ServiceAccount
+    name: katib-controller
+    namespace: kubeflow
--- a/apps/katib/upstream/installs/katib-leader-election/patches/controller.yaml
+++ b/apps/katib/upstream/installs/katib-leader-election/patches/controller.yaml
@ -0,0 +1,3 @@
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--enable-leader-election"
--- a/apps/katib/upstream/installs/katib-openshift/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-openshift/kustomization.yaml
@ -30,13 +30,13 @@ resources:
 images:
  - name: docker.io/kubeflowkatib/katib-controller
    newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-db-manager
    newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-ui
    newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0

 patchesJson6902:
  # Annotate Service to delegate TLS-secret generation to OpenShift service controller
--- a/apps/katib/upstream/installs/katib-standalone/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-standalone/kustomization.yaml
@ -21,13 +21,13 @@ resources:
 images:
  - name: docker.io/kubeflowkatib/katib-controller
    newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-db-manager
    newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-ui
    newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/cert-generator
    newName: docker.io/kubeflowkatib/cert-generator
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
--- a/apps/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml
+++ b/apps/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml
@ -9,13 +9,13 @@ resources:
 images:
  - name: docker.io/kubeflowkatib/katib-controller
    newName: docker.io/kubeflowkatib/katib-controller
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-db-manager
    newName: docker.io/kubeflowkatib/katib-db-manager
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0
  - name: docker.io/kubeflowkatib/katib-ui
    newName: docker.io/kubeflowkatib/katib-ui
-    newTag: v0.12.0
+    newTag: v0.13.0-rc.0

 patchesStrategicMerge:
  - patches/remove-namespace.yaml