From 6a1f7059104105ad960571928a2d4d01d297faaa Mon Sep 17 00:00:00 2001 From: Yannis Zarkadas Date: Mon, 1 Mar 2021 22:52:34 +0200 Subject: [PATCH] manifests: Fold base, overlays into components Signed-off-by: Yannis Zarkadas --- .../katib-controller}/application.yaml | 0 .../katib-controller}/katib-configmap.yaml | 0 .../katib-controller-deployment.yaml | 0 .../katib-controller-rbac.yaml | 0 .../katib-controller-secret.yaml | 0 .../katib-controller-service.yaml | 0 .../katib-ui-deployment.yaml | 0 .../katib-controller}/katib-ui-rbac.yaml | 0 .../katib-controller}/katib-ui-service.yaml | 0 .../katib-ui-virtual-service.yaml | 0 .../katib-controller/kustomization.yaml | 24 ++++----- .../katib-controller}/params.yaml | 0 .../trial-template-configmap.yaml | 0 .../katib-crds}/application.yaml | 0 .../katib-crds}/experiment-crd.yaml | 0 .../components/katib-crds/kustomization.yaml | 8 +-- .../katib-crds}/suggestion-crd.yaml | 0 .../katib-crds}/trial-crd.yaml | 0 .../katib-db-manager-deployment.yaml | 0 .../katib-db-manager-service.yaml | 0 .../katib-db-manager/kustomization.yaml | 4 +- .../katib-mysql-deployment.yaml | 0 .../katib-db-mysql}/katib-mysql-pvc.yaml | 0 .../katib-db-mysql}/katib-mysql-secret.yaml | 0 .../katib-db-mysql}/katib-mysql-service.yaml | 0 .../katib-db-mysql/kustomization.yaml | 8 +-- .../katib-mysql-deployment.yaml | 0 .../katib-standalone-ibm/kustomization.yaml | 2 +- .../katib-controller/base/kustomization.yaml | 53 ------------------- .../v1beta1/katib-controller/base/params.env | 1 - .../v1beta1/katib-controller/base/params.yaml | 7 --- .../overlays/application/kustomization.yaml | 9 ---- .../ibm-storage-config/kustomization.yaml | 10 ---- .../overlays/istio/kustomization.yaml | 8 --- .../katib-crds/base/kustomization.yaml | 7 --- .../overlays/application/kustomization.yaml | 9 ---- 36 files changed, 23 insertions(+), 127 deletions(-) rename manifests/v1beta1/{katib-controller/overlays/application => components/katib-controller}/application.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-configmap.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-controller-deployment.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-controller-rbac.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-controller-secret.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-controller-service.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-ui-deployment.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-ui-rbac.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/katib-ui-service.yaml (100%) rename manifests/v1beta1/{katib-controller/overlays/istio => components/katib-controller}/katib-ui-virtual-service.yaml (100%) rename manifests/v1beta1/{katib-controller/overlays/istio => components/katib-controller}/params.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-controller}/trial-template-configmap.yaml (100%) rename manifests/v1beta1/{katib-crds/overlays/application => components/katib-crds}/application.yaml (100%) rename manifests/v1beta1/{katib-crds/base => components/katib-crds}/experiment-crd.yaml (100%) rename manifests/v1beta1/{katib-crds/base => components/katib-crds}/suggestion-crd.yaml (100%) rename manifests/v1beta1/{katib-crds/base => components/katib-crds}/trial-crd.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-manager}/katib-db-manager-deployment.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-manager}/katib-db-manager-service.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-mysql}/katib-mysql-deployment.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-mysql}/katib-mysql-pvc.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-mysql}/katib-mysql-secret.yaml (100%) rename manifests/v1beta1/{katib-controller/base => components/katib-db-mysql}/katib-mysql-service.yaml (100%) rename manifests/v1beta1/{katib-controller/overlays/ibm-storage-config => installs/katib-standalone-ibm}/katib-mysql-deployment.yaml (100%) delete mode 100644 manifests/v1beta1/katib-controller/base/kustomization.yaml delete mode 100644 manifests/v1beta1/katib-controller/base/params.env delete mode 100644 manifests/v1beta1/katib-controller/base/params.yaml delete mode 100644 manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml delete mode 100644 manifests/v1beta1/katib-controller/overlays/ibm-storage-config/kustomization.yaml delete mode 100644 manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml delete mode 100644 manifests/v1beta1/katib-crds/base/kustomization.yaml delete mode 100644 manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml diff --git a/manifests/v1beta1/katib-controller/overlays/application/application.yaml b/manifests/v1beta1/components/katib-controller/application.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/overlays/application/application.yaml rename to manifests/v1beta1/components/katib-controller/application.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-configmap.yaml b/manifests/v1beta1/components/katib-controller/katib-configmap.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-configmap.yaml rename to manifests/v1beta1/components/katib-controller/katib-configmap.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-controller-deployment.yaml b/manifests/v1beta1/components/katib-controller/katib-controller-deployment.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-controller-deployment.yaml rename to manifests/v1beta1/components/katib-controller/katib-controller-deployment.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-controller-rbac.yaml b/manifests/v1beta1/components/katib-controller/katib-controller-rbac.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-controller-rbac.yaml rename to manifests/v1beta1/components/katib-controller/katib-controller-rbac.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-controller-secret.yaml b/manifests/v1beta1/components/katib-controller/katib-controller-secret.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-controller-secret.yaml rename to manifests/v1beta1/components/katib-controller/katib-controller-secret.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-controller-service.yaml b/manifests/v1beta1/components/katib-controller/katib-controller-service.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-controller-service.yaml rename to manifests/v1beta1/components/katib-controller/katib-controller-service.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-ui-deployment.yaml b/manifests/v1beta1/components/katib-controller/katib-ui-deployment.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-ui-deployment.yaml rename to manifests/v1beta1/components/katib-controller/katib-ui-deployment.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-ui-rbac.yaml b/manifests/v1beta1/components/katib-controller/katib-ui-rbac.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-ui-rbac.yaml rename to manifests/v1beta1/components/katib-controller/katib-ui-rbac.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-ui-service.yaml b/manifests/v1beta1/components/katib-controller/katib-ui-service.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-ui-service.yaml rename to manifests/v1beta1/components/katib-controller/katib-ui-service.yaml diff --git a/manifests/v1beta1/katib-controller/overlays/istio/katib-ui-virtual-service.yaml b/manifests/v1beta1/components/katib-controller/katib-ui-virtual-service.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/overlays/istio/katib-ui-virtual-service.yaml rename to manifests/v1beta1/components/katib-controller/katib-ui-virtual-service.yaml diff --git a/manifests/v1beta1/components/katib-controller/kustomization.yaml b/manifests/v1beta1/components/katib-controller/kustomization.yaml index 81776ca7d50..1e38bfaf4a1 100644 --- 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/manifests/v1beta1/katib-controller/overlays/istio/params.yaml b/manifests/v1beta1/components/katib-controller/params.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/overlays/istio/params.yaml rename to manifests/v1beta1/components/katib-controller/params.yaml diff --git a/manifests/v1beta1/katib-controller/base/trial-template-configmap.yaml b/manifests/v1beta1/components/katib-controller/trial-template-configmap.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/trial-template-configmap.yaml rename to manifests/v1beta1/components/katib-controller/trial-template-configmap.yaml diff --git a/manifests/v1beta1/katib-crds/overlays/application/application.yaml b/manifests/v1beta1/components/katib-crds/application.yaml similarity index 100% rename from manifests/v1beta1/katib-crds/overlays/application/application.yaml rename to manifests/v1beta1/components/katib-crds/application.yaml diff --git a/manifests/v1beta1/katib-crds/base/experiment-crd.yaml b/manifests/v1beta1/components/katib-crds/experiment-crd.yaml similarity index 100% rename from manifests/v1beta1/katib-crds/base/experiment-crd.yaml rename to manifests/v1beta1/components/katib-crds/experiment-crd.yaml diff --git a/manifests/v1beta1/components/katib-crds/kustomization.yaml b/manifests/v1beta1/components/katib-crds/kustomization.yaml index 574dc5fd90e..9ad6e8a618c 100644 --- 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/manifests/v1beta1/katib-crds/base/suggestion-crd.yaml b/manifests/v1beta1/components/katib-crds/suggestion-crd.yaml similarity index 100% rename from manifests/v1beta1/katib-crds/base/suggestion-crd.yaml rename to manifests/v1beta1/components/katib-crds/suggestion-crd.yaml diff --git a/manifests/v1beta1/katib-crds/base/trial-crd.yaml b/manifests/v1beta1/components/katib-crds/trial-crd.yaml similarity index 100% rename from manifests/v1beta1/katib-crds/base/trial-crd.yaml rename to manifests/v1beta1/components/katib-crds/trial-crd.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-db-manager-deployment.yaml b/manifests/v1beta1/components/katib-db-manager/katib-db-manager-deployment.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-db-manager-deployment.yaml rename to manifests/v1beta1/components/katib-db-manager/katib-db-manager-deployment.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-db-manager-service.yaml b/manifests/v1beta1/components/katib-db-manager/katib-db-manager-service.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-db-manager-service.yaml rename to manifests/v1beta1/components/katib-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 index 401120f1eab..d118092b464 100644 --- 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/manifests/v1beta1/katib-controller/base/katib-mysql-deployment.yaml b/manifests/v1beta1/components/katib-db-mysql/katib-mysql-deployment.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-mysql-deployment.yaml rename to manifests/v1beta1/components/katib-db-mysql/katib-mysql-deployment.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-mysql-pvc.yaml b/manifests/v1beta1/components/katib-db-mysql/katib-mysql-pvc.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-mysql-pvc.yaml rename to manifests/v1beta1/components/katib-db-mysql/katib-mysql-pvc.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-mysql-secret.yaml b/manifests/v1beta1/components/katib-db-mysql/katib-mysql-secret.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-mysql-secret.yaml rename to manifests/v1beta1/components/katib-db-mysql/katib-mysql-secret.yaml diff --git a/manifests/v1beta1/katib-controller/base/katib-mysql-service.yaml b/manifests/v1beta1/components/katib-db-mysql/katib-mysql-service.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/base/katib-mysql-service.yaml rename to manifests/v1beta1/components/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 index a5506a6a9ef..cdd1a327935 100644 --- 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/manifests/v1beta1/katib-controller/overlays/ibm-storage-config/katib-mysql-deployment.yaml b/manifests/v1beta1/installs/katib-standalone-ibm/katib-mysql-deployment.yaml similarity index 100% rename from manifests/v1beta1/katib-controller/overlays/ibm-storage-config/katib-mysql-deployment.yaml rename to manifests/v1beta1/installs/katib-standalone-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 index 85108e5d02d..e62069d1776 100644 --- 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 deleted file mode 100644 index 5b12df2fc08..00000000000 --- a/manifests/v1beta1/katib-controller/base/kustomization.yaml +++ /dev/null @@ -1,53 +0,0 @@ -namespace: kubeflow -resources: - - katib-configmap.yaml - - katib-controller-deployment.yaml - - 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 - - trial-template-configmap.yaml -configMapGenerator: - - name: katib-parameters - envs: - - params.env -generatorOptions: - disableNameSuffixHash: true -images: - - name: docker.io/kubeflowkatib/katib-controller - newTag: v1beta1-a96ff59 - newName: docker.io/kubeflowkatib/katib-controller - - name: docker.io/kubeflowkatib/katib-db-manager - newTag: v1beta1-a96ff59 - newName: docker.io/kubeflowkatib/katib-db-manager - - name: docker.io/kubeflowkatib/katib-ui - newTag: v1beta1-a96ff59 - newName: docker.io/kubeflowkatib/katib-ui - - name: mysql - newTag: "8" - newName: mysql -vars: - - name: clusterDomain - objref: - kind: ConfigMap - name: katib-parameters - apiVersion: v1 - fieldref: - fieldpath: data.clusterDomain - - name: katib-ui-namespace - objref: - kind: Service - name: katib-ui - apiVersion: v1 - fieldref: - fieldpath: metadata.namespace -configurations: - - params.yaml diff --git a/manifests/v1beta1/katib-controller/base/params.env b/manifests/v1beta1/katib-controller/base/params.env deleted file mode 100644 index bdd6604e950..00000000000 --- a/manifests/v1beta1/katib-controller/base/params.env +++ /dev/null @@ -1 +0,0 @@ -clusterDomain=cluster.local diff --git a/manifests/v1beta1/katib-controller/base/params.yaml b/manifests/v1beta1/katib-controller/base/params.yaml deleted file mode 100644 index 3d076361693..00000000000 --- a/manifests/v1beta1/katib-controller/base/params.yaml +++ /dev/null @@ -1,7 +0,0 @@ -varReference: - - path: data/config - kind: ConfigMap - - path: data/config - kind: Deployment - - path: metadata/annotations/getambassador.io\/config - kind: Service diff --git a/manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml b/manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml deleted file mode 100644 index 7bee99725e6..00000000000 --- a/manifests/v1beta1/katib-controller/overlays/application/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -bases: - - ../../base -commonLabels: - app.kubernetes.io/component: katib - app.kubernetes.io/name: katib-controller -kind: Kustomization -resources: - - application.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 deleted file mode 100644 index 9dcdf768b5b..00000000000 --- a/manifests/v1beta1/katib-controller/overlays/ibm-storage-config/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -bases: - - ../../base -patchesStrategicMerge: - - katib-mysql-deployment.yaml -images: - - name: mysql - newTag: "5.6" - newName: mysql diff --git a/manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml b/manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml deleted file mode 100644 index 4cf4c0de08d..00000000000 --- a/manifests/v1beta1/katib-controller/overlays/istio/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -bases: - - ../../base -resources: - - katib-ui-virtual-service.yaml -configurations: - - params.yaml diff --git a/manifests/v1beta1/katib-crds/base/kustomization.yaml b/manifests/v1beta1/katib-crds/base/kustomization.yaml deleted file mode 100644 index 869c7add028..00000000000 --- a/manifests/v1beta1/katib-crds/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -namespace: kubeflow -resources: - - experiment-crd.yaml - - suggestion-crd.yaml - - trial-crd.yaml -generatorOptions: - disableNameSuffixHash: true diff --git a/manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml b/manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml deleted file mode 100644 index 1eb85ff117e..00000000000 --- a/manifests/v1beta1/katib-crds/overlays/application/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -bases: - - ../../base -commonLabels: - app.kubernetes.io/component: katib - app.kubernetes.io/name: katib-crds -kind: Kustomization -resources: - - application.yaml