diff --git a/manifests/kustomize/base/metadata/kustomization.yaml b/manifests/kustomize/base/metadata/kustomization.yaml index 0b5448235c1..31f31d993d3 100644 --- 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/manifests/kustomize/base/metadata/metadata-grpc/metadata-envoy-deployment.yaml b/manifests/kustomize/base/metadata/metadata-envoy-deployment.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-grpc/metadata-envoy-deployment.yaml rename to manifests/kustomize/base/metadata/metadata-envoy-deployment.yaml diff --git a/manifests/kustomize/base/metadata/metadata-grpc/metadata-envoy-service.yaml b/manifests/kustomize/base/metadata/metadata-envoy-service.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-grpc/metadata-envoy-service.yaml rename to manifests/kustomize/base/metadata/metadata-envoy-service.yaml diff --git a/manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-configmap.yaml b/manifests/kustomize/base/metadata/metadata-grpc-configmap.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-configmap.yaml rename to manifests/kustomize/base/metadata/metadata-grpc-configmap.yaml diff --git a/manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-deployment.yaml b/manifests/kustomize/base/metadata/metadata-grpc-deployment.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-deployment.yaml rename to manifests/kustomize/base/metadata/metadata-grpc-deployment.yaml diff --git a/manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-service.yaml b/manifests/kustomize/base/metadata/metadata-grpc-service.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-grpc/metadata-grpc-service.yaml rename to manifests/kustomize/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 deleted file mode 100644 index 31f31d993d3..00000000000 --- a/manifests/kustomize/base/metadata/metadata-grpc/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -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/manifests/kustomize/base/pipeline/kustomization.yaml b/manifests/kustomize/base/pipeline/kustomization.yaml index 58cca4ad0a9..f503238036f 100644 --- 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/manifests/kustomize/base/metadata/metadata-writer/kustomization.yaml b/manifests/kustomize/base/pipeline/metadata-writer/kustomization.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-writer/kustomization.yaml rename to manifests/kustomize/base/pipeline/metadata-writer/kustomization.yaml diff --git a/manifests/kustomize/base/metadata/metadata-writer/metadata-writer-deployment.yaml b/manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-deployment.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-writer/metadata-writer-deployment.yaml rename to manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-deployment.yaml diff --git a/manifests/kustomize/base/metadata/metadata-writer/metadata-writer-role.yaml b/manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-role.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-writer/metadata-writer-role.yaml rename to manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-role.yaml diff --git a/manifests/kustomize/base/metadata/metadata-writer/metadata-writer-rolebinding.yaml b/manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-writer/metadata-writer-rolebinding.yaml rename to manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml diff --git a/manifests/kustomize/base/metadata/metadata-writer/metadata-writer-sa.yaml b/manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-sa.yaml similarity index 100% rename from manifests/kustomize/base/metadata/metadata-writer/metadata-writer-sa.yaml rename to manifests/kustomize/base/pipeline/metadata-writer/metadata-writer-sa.yaml diff --git a/manifests/kustomize/hack/format.sh b/manifests/kustomize/hack/format.sh index 0df489218bb..9eece41fbb0 100755 --- 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 index b1fe08da73c..4094183f958 100755 --- 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" )