katib-controller: Move mysql to overlay

similar to kubeflow#673, this allows users to create their own overlay to use external databases.
discordianfish · Apr 14, 2020 · 2ae7a5d · 2ae7a5d
1 parent b5df17f
commit 2ae7a5d
Show file tree

Hide file tree

Showing 49 changed files with 111 additions and 270 deletions.
diff --git a/katib/katib-controller/base/kustomization.yaml b/katib/katib-controller/base/kustomization.yaml
@@ -5,12 +5,6 @@ resources:
 - katib-controller-rbac.yaml
 - katib-controller-secret.yaml
 - katib-controller-service.yaml
-- katib-mysql-deployment.yaml
-- katib-mysql-pvc.yaml
-- katib-mysql-secret.yaml
-- katib-mysql-service.yaml
-- katib-db-manager-deployment.yaml
-- katib-db-manager-service.yaml
 - katib-ui-deployment.yaml
 - katib-ui-rbac.yaml
 - katib-ui-service.yaml
@@ -24,15 +18,9 @@ images:
 - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
   newTag: v0.8.0
   newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-controller
-- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
-  newTag: v0.8.0
-  newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
 - name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
   newTag: v0.8.0
   newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-ui
-- name: mysql
-  newTag: "8"
-  newName: mysql
 vars:
 - name: clusterDomain
   objref:

diff --git a/...ler/base/katib-db-manager-deployment.yaml → ...-manager/katib-db-manager-deployment.yaml b/...ler/base/katib-db-manager-deployment.yaml → ...-manager/katib-db-manager-deployment.yaml
@@ -24,14 +24,6 @@ spec:
       - name: katib-db-manager
         image: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
         imagePullPolicy: IfNotPresent
-        env:
-          - name : DB_NAME
-            value: "mysql"
-          - name: DB_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: katib-mysql-secrets
-                key: MYSQL_ROOT_PASSWORD
         command:
           - './katib-db-manager'
         ports:

diff --git a/...roller/base/katib-db-manager-service.yaml → .../db-manager/katib-db-manager-service.yaml b/...roller/base/katib-db-manager-service.yaml → .../db-manager/katib-db-manager-service.yaml
diff --git a/katib/katib-controller/overlays/db-manager/kustomization.yaml b/katib/katib-controller/overlays/db-manager/kustomization.yaml
@@ -0,0 +1,10 @@
+namespace: kubeflow
+bases:
+- ../base
+resources:
+- katib-db-manager-deployment.yaml
+- katib-db-manager-service.yaml
+images:
+- name: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
+  newTag: v0.8.0
+  newName: gcr.io/kubeflow-images-public/katib/v1alpha3/katib-db-manager
diff --git a/katib/katib-controller/overlays/db/katib-db-manager-deployment.yaml b/katib/katib-controller/overlays/db/katib-db-manager-deployment.yaml
@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: katib-db-manager
+spec:
+  template:
+    spec:
+      containers:
+      - name: katib-db-manager
+        env:
+          - name : DB_NAME
+            value: "mysql"
+          - name: DB_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: katib-mysql-secrets
+                key: MYSQL_ROOT_PASSWORD
diff --git a/...ntroller/base/katib-mysql-deployment.yaml → ...r/overlays/db/katib-mysql-deployment.yaml b/...ntroller/base/katib-mysql-deployment.yaml → ...r/overlays/db/katib-mysql-deployment.yaml
diff --git a/...atib-controller/base/katib-mysql-pvc.yaml → ...ntroller/overlays/db/katib-mysql-pvc.yaml b/...atib-controller/base/katib-mysql-pvc.yaml → ...ntroller/overlays/db/katib-mysql-pvc.yaml
diff --git a/...b-controller/base/katib-mysql-secret.yaml → ...oller/overlays/db/katib-mysql-secret.yaml b/...b-controller/base/katib-mysql-secret.yaml → ...oller/overlays/db/katib-mysql-secret.yaml
diff --git a/...-controller/base/katib-mysql-service.yaml → ...ller/overlays/db/katib-mysql-service.yaml b/...-controller/base/katib-mysql-service.yaml → ...ller/overlays/db/katib-mysql-service.yaml
diff --git a/katib/katib-controller/overlays/db/kustomization.yaml b/katib/katib-controller/overlays/db/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+- ../../base
+resources:
+- katib-mysql-deployment.yaml
+- katib-mysql-pvc.yaml
+- katib-mysql-secret.yaml
+- katib-mysql-service.yaml
+patchesStrategicMerge:
+- katib-db-manager-deployment.yaml
+images:
+- name: mysql
+  newTag: "8"
+  newName: mysql
diff --git a/katib/katib-controller/overlays/ibm-storage-config/kustomization.yaml b/katib/katib-controller/overlays/ibm-storage-config/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../../base
+- ../db/
 patchesStrategicMerge:
 - katib-mysql-deployment.yaml
 images:

diff --git a/kfdef/kfctl_anthos.v1.0.0.yaml b/kfdef/kfctl_anthos.v1.0.0.yaml
@@ -225,6 +225,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_anthos.v1.0.1.yaml b/kfdef/kfctl_anthos.v1.0.1.yaml
@@ -225,6 +225,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_anthos.yaml b/kfdef/kfctl_anthos.yaml
@@ -225,6 +225,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws.v1.0.0.yaml b/kfdef/kfctl_aws.v1.0.0.yaml
@@ -219,6 +219,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws.v1.0.1.yaml b/kfdef/kfctl_aws.v1.0.1.yaml
@@ -219,6 +219,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws.yaml b/kfdef/kfctl_aws.yaml
@@ -219,6 +219,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws_cognito.v1.0.0.yaml b/kfdef/kfctl_aws_cognito.v1.0.0.yaml
@@ -214,6 +214,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws_cognito.v1.0.1.yaml b/kfdef/kfctl_aws_cognito.v1.0.1.yaml
@@ -214,6 +214,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_aws_cognito.yaml b/kfdef/kfctl_aws_cognito.yaml
@@ -214,6 +214,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_gcp_basic_auth.v1.0.0.yaml b/kfdef/kfctl_gcp_basic_auth.v1.0.0.yaml
@@ -253,6 +253,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_gcp_basic_auth.v1.0.1.yaml b/kfdef/kfctl_gcp_basic_auth.v1.0.1.yaml
@@ -253,6 +253,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_gcp_basic_auth.yaml b/kfdef/kfctl_gcp_basic_auth.yaml
@@ -253,6 +253,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_gcp_iap.v1.0.0.yaml b/kfdef/kfctl_gcp_iap.v1.0.0.yaml
@@ -263,13 +263,16 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller
     name: katib-controller
   - kustomizeConfig:
       overlays:
       - application
+      - use-kf-user
       repoRef:
         name: manifests
         path: pipeline/api-service
@@ -314,6 +317,7 @@ spec:
   - kustomizeConfig:
       overlays:
       - application
+      - use-kf-user
       repoRef:
         name: manifests
         path: pipeline/pipelines-runner

diff --git a/kfdef/kfctl_gcp_iap.v1.0.1.yaml b/kfdef/kfctl_gcp_iap.v1.0.1.yaml
@@ -263,13 +263,16 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller
     name: katib-controller
   - kustomizeConfig:
       overlays:
       - application
+      - use-kf-user
       repoRef:
         name: manifests
         path: pipeline/api-service
@@ -314,6 +317,7 @@ spec:
   - kustomizeConfig:
       overlays:
       - application
+      - use-kf-user
       repoRef:
         name: manifests
         path: pipeline/pipelines-runner

diff --git a/kfdef/kfctl_gcp_iap.yaml b/kfdef/kfctl_gcp_iap.yaml
@@ -263,6 +263,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_ibm.v1.0.0.yaml b/kfdef/kfctl_ibm.v1.0.0.yaml
@@ -262,6 +262,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       - ibm-storage-config
       repoRef:
         name: manifests

diff --git a/kfdef/kfctl_ibm.v1.0.1.yaml b/kfdef/kfctl_ibm.v1.0.1.yaml
@@ -262,6 +262,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       - ibm-storage-config
       repoRef:
         name: manifests

diff --git a/kfdef/kfctl_ibm.yaml b/kfdef/kfctl_ibm.yaml
@@ -262,6 +262,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       - ibm-storage-config
       repoRef:
         name: manifests

diff --git a/kfdef/kfctl_istio_dex.v1.0.0.yaml b/kfdef/kfctl_istio_dex.v1.0.0.yaml
@@ -276,6 +276,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_istio_dex.v1.0.1.yaml b/kfdef/kfctl_istio_dex.v1.0.1.yaml
@@ -276,6 +276,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_istio_dex.yaml b/kfdef/kfctl_istio_dex.yaml
@@ -276,6 +276,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_k8s_istio.v1.0.0.yaml b/kfdef/kfctl_k8s_istio.v1.0.0.yaml
@@ -258,6 +258,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_k8s_istio.v1.0.1.yaml b/kfdef/kfctl_k8s_istio.v1.0.1.yaml
@@ -258,6 +258,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/kfctl_k8s_istio.yaml b/kfdef/kfctl_k8s_istio.yaml
@@ -258,6 +258,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_anthos.yaml b/kfdef/source/master/kfctl_anthos.yaml
@@ -229,6 +229,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_aws.yaml b/kfdef/source/master/kfctl_aws.yaml
@@ -219,6 +219,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_aws_cognito.yaml b/kfdef/source/master/kfctl_aws_cognito.yaml
@@ -214,6 +214,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_gcp_basic_auth.yaml b/kfdef/source/master/kfctl_gcp_basic_auth.yaml
@@ -254,6 +254,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_gcp_iap.yaml b/kfdef/source/master/kfctl_gcp_iap.yaml
@@ -265,6 +265,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       repoRef:
         name: manifests
         path: katib/katib-controller

diff --git a/kfdef/source/master/kfctl_ibm.yaml b/kfdef/source/master/kfctl_ibm.yaml
@@ -266,6 +266,8 @@ spec:
       overlays:
       - application
       - istio
+      - db
+      - db-manager
       - ibm-storage-config
       repoRef:
         name: manifests