manifests: Fold base, overlays into components

Signed-off-by: Yannis Zarkadas <yanniszark@arrikto.com>
kubeflow · Mar 4, 2021 · 6a1f705 · 6a1f705
1 parent 259e2f7
commit 6a1f705
Show file tree

Hide file tree

Showing 36 changed files with 23 additions and 127 deletions.
diff --git a/...ler/overlays/application/application.yaml → ...ponents/katib-controller/application.yaml b/...ler/overlays/application/application.yaml → ...ponents/katib-controller/application.yaml
diff --git a/...atib-controller/base/katib-configmap.yaml → ...nts/katib-controller/katib-configmap.yaml b/...atib-controller/base/katib-configmap.yaml → ...nts/katib-controller/katib-configmap.yaml
diff --git a/...ler/base/katib-controller-deployment.yaml → ...ntroller/katib-controller-deployment.yaml b/...ler/base/katib-controller-deployment.yaml → ...ntroller/katib-controller-deployment.yaml
diff --git a/...ontroller/base/katib-controller-rbac.yaml → ...tib-controller/katib-controller-rbac.yaml b/...ontroller/base/katib-controller-rbac.yaml → ...tib-controller/katib-controller-rbac.yaml
diff --git a/...troller/base/katib-controller-secret.yaml → ...b-controller/katib-controller-secret.yaml b/...troller/base/katib-controller-secret.yaml → ...b-controller/katib-controller-secret.yaml
diff --git a/...roller/base/katib-controller-service.yaml → ...-controller/katib-controller-service.yaml b/...roller/base/katib-controller-service.yaml → ...-controller/katib-controller-service.yaml
diff --git a/...-controller/base/katib-ui-deployment.yaml → ...katib-controller/katib-ui-deployment.yaml b/...-controller/base/katib-ui-deployment.yaml → ...katib-controller/katib-ui-deployment.yaml
diff --git a/.../katib-controller/base/katib-ui-rbac.yaml → ...nents/katib-controller/katib-ui-rbac.yaml b/.../katib-controller/base/katib-ui-rbac.yaml → ...nents/katib-controller/katib-ui-rbac.yaml
diff --git a/...tib-controller/base/katib-ui-service.yaml → ...ts/katib-controller/katib-ui-service.yaml b/...tib-controller/base/katib-ui-service.yaml → ...ts/katib-controller/katib-ui-service.yaml
diff --git a/...rlays/istio/katib-ui-virtual-service.yaml → ...-controller/katib-ui-virtual-service.yaml b/...rlays/istio/katib-ui-virtual-service.yaml → ...-controller/katib-ui-virtual-service.yaml
diff --git a/manifests/v1beta1/components/katib-controller/kustomization.yaml b/manifests/v1beta1/components/katib-controller/kustomization.yaml
@@ -2,17 +2,17 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../katib-controller/base/katib-configmap.yaml
-  - ../../katib-controller/base/katib-controller-deployment.yaml
-  - ../../katib-controller/base/katib-controller-rbac.yaml
-  - ../../katib-controller/base/katib-controller-secret.yaml
-  - ../../katib-controller/base/katib-controller-service.yaml
-  - ../../katib-controller/base/katib-ui-deployment.yaml
-  - ../../katib-controller/base/katib-ui-rbac.yaml
-  - ../../katib-controller/base/katib-ui-service.yaml
-  - ../../katib-controller/base/trial-template-configmap.yaml
-  - ../../katib-controller/overlays/application/application.yaml
-  - ../../katib-controller/overlays/istio/katib-ui-virtual-service.yaml
+  - katib-configmap.yaml
+  - katib-controller-deployment.yaml
+  - katib-controller-rbac.yaml
+  - katib-controller-secret.yaml
+  - katib-controller-service.yaml
+  - katib-ui-deployment.yaml
+  - katib-ui-rbac.yaml
+  - katib-ui-service.yaml
+  - trial-template-configmap.yaml
+  - application.yaml
+  - katib-ui-virtual-service.yaml
 images:
   - name: docker.io/kubeflowkatib/katib-controller
     newTag: v1beta1-a96ff59
@@ -24,4 +24,4 @@ commonLabels:
   app.kubernetes.io/component: katib
   app.kubernetes.io/name: katib-controller
 configurations:
-  - ../../katib-controller/overlays/istio/params.yaml
+  - params.yaml
diff --git a/...tib-controller/overlays/istio/params.yaml → ...1/components/katib-controller/params.yaml b/...tib-controller/overlays/istio/params.yaml → ...1/components/katib-controller/params.yaml
diff --git a/...roller/base/trial-template-configmap.yaml → ...-controller/trial-template-configmap.yaml b/...roller/base/trial-template-configmap.yaml → ...-controller/trial-template-configmap.yaml
diff --git a/...rds/overlays/application/application.yaml → ...a1/components/katib-crds/application.yaml b/...rds/overlays/application/application.yaml → ...a1/components/katib-crds/application.yaml
diff --git a/...beta1/katib-crds/base/experiment-crd.yaml → ...components/katib-crds/experiment-crd.yaml b/...beta1/katib-crds/base/experiment-crd.yaml → ...components/katib-crds/experiment-crd.yaml
diff --git a/manifests/v1beta1/components/katib-crds/kustomization.yaml b/manifests/v1beta1/components/katib-crds/kustomization.yaml
@@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../katib-crds/base/experiment-crd.yaml
-  - ../../katib-crds/base/suggestion-crd.yaml
-  - ../../katib-crds/base/trial-crd.yaml
-  - ../../katib-crds/overlays/application/application.yaml
+  - experiment-crd.yaml
+  - suggestion-crd.yaml
+  - trial-crd.yaml
+  - application.yaml
 commonLabels:
   app.kubernetes.io/component: katib
   app.kubernetes.io/name: katib-crds
diff --git a/...beta1/katib-crds/base/suggestion-crd.yaml → ...components/katib-crds/suggestion-crd.yaml b/...beta1/katib-crds/base/suggestion-crd.yaml → ...components/katib-crds/suggestion-crd.yaml
diff --git a/...ts/v1beta1/katib-crds/base/trial-crd.yaml → ...eta1/components/katib-crds/trial-crd.yaml b/...ts/v1beta1/katib-crds/base/trial-crd.yaml → ...eta1/components/katib-crds/trial-crd.yaml
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
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/manifests/v1beta1/components/katib-db-manager/kustomization.yaml b/manifests/v1beta1/components/katib-db-manager/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../katib-controller/base/katib-db-manager-deployment.yaml
-  - ../../katib-controller/base/katib-db-manager-service.yaml
+  - katib-db-manager-deployment.yaml
+  - katib-db-manager-service.yaml
 images:
   - name: docker.io/kubeflowkatib/katib-db-manager
     newTag: v1beta1-a96ff59

diff --git a/...ntroller/base/katib-mysql-deployment.yaml → ...atib-db-mysql/katib-mysql-deployment.yaml b/...ntroller/base/katib-mysql-deployment.yaml → ...atib-db-mysql/katib-mysql-deployment.yaml
diff --git a/...atib-controller/base/katib-mysql-pvc.yaml → ...nents/katib-db-mysql/katib-mysql-pvc.yaml b/...atib-controller/base/katib-mysql-pvc.yaml → ...nents/katib-db-mysql/katib-mysql-pvc.yaml
diff --git a/...b-controller/base/katib-mysql-secret.yaml → ...ts/katib-db-mysql/katib-mysql-secret.yaml b/...b-controller/base/katib-mysql-secret.yaml → ...ts/katib-db-mysql/katib-mysql-secret.yaml
diff --git a/...-controller/base/katib-mysql-service.yaml → ...s/katib-db-mysql/katib-mysql-service.yaml b/...-controller/base/katib-mysql-service.yaml → ...s/katib-db-mysql/katib-mysql-service.yaml
diff --git a/manifests/v1beta1/components/katib-db-mysql/kustomization.yaml b/manifests/v1beta1/components/katib-db-mysql/kustomization.yaml
@@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../katib-controller/base/katib-mysql-deployment.yaml
-  - ../../katib-controller/base/katib-mysql-pvc.yaml
-  - ../../katib-controller/base/katib-mysql-secret.yaml
-  - ../../katib-controller/base/katib-mysql-service.yaml
+  - katib-mysql-deployment.yaml
+  - katib-mysql-pvc.yaml
+  - katib-mysql-secret.yaml
+  - katib-mysql-service.yaml
 images:
   - name: mysql
     newTag: "8"

diff --git a/...torage-config/katib-mysql-deployment.yaml → ...tandalone-ibm/katib-mysql-deployment.yaml b/...torage-config/katib-mysql-deployment.yaml → ...tandalone-ibm/katib-mysql-deployment.yaml
diff --git a/manifests/v1beta1/installs/katib-standalone-ibm/kustomization.yaml b/manifests/v1beta1/installs/katib-standalone-ibm/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 bases:
   - ../katib-standalone
 patchesStrategicMerge:
-  - ../../katib-controller/overlays/ibm-storage-config/katib-mysql-deployment.yaml
+  - katib-mysql-deployment.yaml
 images:
   - name: mysql
     newTag: "5.6"

diff --git a/manifests/v1beta1/katib-controller/base/kustomization.yaml b/manifests/v1beta1/katib-controller/base/kustomization.yaml
diff --git a/manifests/v1beta1/katib-controller/base/params.env b/manifests/v1beta1/katib-controller/base/params.env
diff --git a/manifests/v1beta1/katib-controller/base/params.yaml b/manifests/v1beta1/katib-controller/base/params.yaml
diff --git a/manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml b/manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml
diff --git a/manifests/v1beta1/katib-controller/overlays/ibm-storage-config/kustomization.yaml b/manifests/v1beta1/katib-controller/overlays/ibm-storage-config/kustomization.yaml
diff --git a/manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml b/manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml
diff --git a/manifests/v1beta1/katib-crds/base/kustomization.yaml b/manifests/v1beta1/katib-crds/base/kustomization.yaml
diff --git a/manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml b/manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml