refactor(deployment): separate metadata-writer and metadata-grpc fold…

…ers (#4071) * refactor(deployment): separate metadata-writer and metadata-grpc folders * fix release script
kubeflow · Jul 2, 2020 · 51872e4 · 51872e4
1 parent 287c1ab
commit 51872e4
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 19 deletions.
diff --git a/manifests/kustomize/base/metadata/kustomization.yaml b/manifests/kustomize/base/metadata/kustomization.yaml
@@ -1,6 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
-bases:
-  - metadata-grpc
-  - metadata-writer
+resources:
+- metadata-grpc-configmap.yaml
+- metadata-grpc-deployment.yaml
+- metadata-grpc-service.yaml
+- metadata-envoy-deployment.yaml
+- metadata-envoy-service.yaml
+images:
+- name: gcr.io/ml-pipeline/metadata-envoy
+  newTag: 1.0.0-rc.2
diff --git a/...adata-grpc/metadata-envoy-deployment.yaml → ...e/metadata/metadata-envoy-deployment.yaml b/...adata-grpc/metadata-envoy-deployment.yaml → ...e/metadata/metadata-envoy-deployment.yaml
diff --git a/...metadata-grpc/metadata-envoy-service.yaml → ...base/metadata/metadata-envoy-service.yaml b/...metadata-grpc/metadata-envoy-service.yaml → ...base/metadata/metadata-envoy-service.yaml
diff --git a/...etadata-grpc/metadata-grpc-configmap.yaml → ...ase/metadata/metadata-grpc-configmap.yaml b/...etadata-grpc/metadata-grpc-configmap.yaml → ...ase/metadata/metadata-grpc-configmap.yaml
diff --git a/...tadata-grpc/metadata-grpc-deployment.yaml → ...se/metadata/metadata-grpc-deployment.yaml b/...tadata-grpc/metadata-grpc-deployment.yaml → ...se/metadata/metadata-grpc-deployment.yaml
diff --git a/.../metadata-grpc/metadata-grpc-service.yaml → .../base/metadata/metadata-grpc-service.yaml b/.../metadata-grpc/metadata-grpc-service.yaml → .../base/metadata/metadata-grpc-service.yaml
diff --git a/manifests/kustomize/base/metadata/metadata-grpc/kustomization.yaml b/manifests/kustomize/base/metadata/metadata-grpc/kustomization.yaml
diff --git a/manifests/kustomize/base/pipeline/kustomization.yaml b/manifests/kustomize/base/pipeline/kustomization.yaml
@@ -1,5 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+bases:
+- metadata-writer
 resources:
 - ml-pipeline-apiserver-deployment.yaml
 - ml-pipeline-apiserver-role.yaml

diff --git a/...tadata/metadata-writer/kustomization.yaml → ...peline/metadata-writer/kustomization.yaml b/...tadata/metadata-writer/kustomization.yaml → ...peline/metadata-writer/kustomization.yaml
diff --git a/...ta-writer/metadata-writer-deployment.yaml → ...ta-writer/metadata-writer-deployment.yaml b/...ta-writer/metadata-writer-deployment.yaml → ...ta-writer/metadata-writer-deployment.yaml
diff --git a/...metadata-writer/metadata-writer-role.yaml → ...metadata-writer/metadata-writer-role.yaml b/...metadata-writer/metadata-writer-role.yaml → ...metadata-writer/metadata-writer-role.yaml
diff --git a/...a-writer/metadata-writer-rolebinding.yaml → ...a-writer/metadata-writer-rolebinding.yaml b/...a-writer/metadata-writer-rolebinding.yaml → ...a-writer/metadata-writer-rolebinding.yaml
diff --git a/...a/metadata-writer/metadata-writer-sa.yaml → ...e/metadata-writer/metadata-writer-sa.yaml b/...a/metadata-writer/metadata-writer-sa.yaml → ...e/metadata-writer/metadata-writer-sa.yaml
diff --git a/manifests/kustomize/hack/format.sh b/manifests/kustomize/hack/format.sh
@@ -28,8 +28,8 @@ echo "This formatting script uses yq, it can be downloaded at https://github.com
 kustomization_yamls_with_images=(
   "base/cache-deployer/kustomization.yaml"
   "base/cache/kustomization.yaml"
-  "base/metadata/metadata-grpc/kustomization.yaml"
-  "base/metadata/metadata-writer/kustomization.yaml"
+  "base/metadata/kustomization.yaml"
+  "base/pipeline/metadata-writer/kustomization.yaml"
   "base/pipeline/kustomization.yaml"
   "env/gcp/inverse-proxy/kustomization.yaml"
 )

diff --git a/manifests/kustomize/hack/release.sh b/manifests/kustomize/hack/release.sh
@@ -28,8 +28,8 @@ echo "This release script uses yq, it can be downloaded at https://github.com/mi
 kustomization_yamls_with_images=(
   "base/cache-deployer/kustomization.yaml"
   "base/cache/kustomization.yaml"
-  "base/metadata/metadata-grpc/kustomization.yaml"
-  "base/metadata/metadata-writer/kustomization.yaml"
+  "base/metadata/kustomization.yaml"
+  "base/pipeline/metadata-writer/kustomization.yaml"
   "base/pipeline/kustomization.yaml"
   "env/gcp/inverse-proxy/kustomization.yaml"
 )