From a59d753d76c8c35bf17b88b5cd9cea80768f0e69 Mon Sep 17 00:00:00 2001 From: Yuan Gong Date: Wed, 1 Dec 2021 02:16:17 +0000 Subject: [PATCH] test(kfp): upgrade to 1.8.0-alpha.0 --- acm-repos/kfp-standalone-1/kfp-all.yaml | 153 +++++++++++------- test-infra/kfp/Makefile | 2 +- .../kustomize/upstream/Kptfile | 13 +- .../kustomize/upstream/OWNERS | 4 +- .../base/application/application.yaml | 3 +- .../cache-deployer-deployment.yaml | 2 +- .../cache-deployer/cache-deployer-role.yaml | 2 +- .../cache-deployer-rolebinding.yaml | 4 +- .../cache-deployer-clusterrole.yaml | 4 +- .../cache-deployer-clusterrolebinding.yaml | 2 +- .../cluster-scoped/cache-deployer-sa.yaml | 2 +- .../cluster-scoped/kustomization.yaml | 2 + .../base/cache-deployer/kustomization.yaml | 2 +- .../upstream/base/cache/cache-deployment.yaml | 93 ++++++----- .../upstream/base/cache/cache-role.yaml | 2 +- .../base/cache/cache-rolebinding.yaml | 4 +- .../upstream/base/cache/cache-sa.yaml | 2 +- .../upstream/base/cache/cache-service.yaml | 4 +- .../upstream/base/cache/kustomization.yaml | 2 +- .../base/installs/generic/mysql-secret.yaml | 2 +- .../generic/pipeline-install-config.yaml | 4 +- .../api-service/cluster-role-binding.yaml | 2 +- .../multi-user/api-service/cluster-role.yaml | 2 +- .../api-service/deployment-patch.yaml | 2 +- .../multi-user/api-service/kustomization.yaml | 2 +- .../cache/cluster-role-binding.yaml | 2 +- .../multi-user/cache/cluster-role.yaml | 2 +- .../multi-user/cache/deployment-patch.yaml | 8 +- .../istio-authorization-config.yaml | 16 +- .../installs/multi-user/kustomization.yaml | 1 + .../metadata-writer/cluster-role-binding.yaml | 2 +- .../metadata-writer/cluster-role.yaml | 2 +- .../metadata-writer/deployment-patch.yaml | 2 +- .../cluster-role-binding.yaml | 2 +- .../persistence-agent/cluster-role.yaml | 2 +- .../persistence-agent/deployment-patch.yaml | 2 +- .../composite-controller.yaml | 9 +- .../deployment.yaml | 2 +- .../pipelines-profile-controller/service.yaml | 2 +- .../pipelines-ui/cluster-role-binding.yaml | 2 +- .../multi-user/pipelines-ui/cluster-role.yaml | 2 +- .../pipelines-ui/configmap-patch.yaml | 8 +- .../pipelines-ui/deployment-patch.yaml | 2 +- .../cluster-role-binding.yaml | 2 +- .../scheduled-workflow/cluster-role.yaml | 2 +- .../scheduled-workflow/deployment-patch.yaml | 2 +- .../multi-user/view-edit-cluster-roles.yaml | 37 ++++- .../cluster-role-binding.yaml | 2 +- .../viewer-controller/cluster-role.yaml | 3 +- .../viewer-controller/deployment-patch.yaml | 2 +- .../installs/multi-user/virtual-service.yaml | 2 +- .../base/metadata/base/kustomization.yaml | 2 +- .../base/metadata-envoy-deployment.yaml | 2 +- .../metadata/base/metadata-envoy-service.yaml | 2 +- .../base/metadata-grpc-configmap.yaml | 2 +- .../base/metadata-grpc-deployment.yaml | 14 +- .../base/metadata/base/metadata-grpc-sa.yaml | 2 +- .../metadata/base/metadata-grpc-service.yaml | 2 +- .../options/istio/destination-rule.yaml | 2 +- .../istio/istio-authorization-policy.yaml | 2 +- .../metadata/options/istio/kustomization.yaml | 1 + .../options/istio/virtual-service.yaml | 2 +- .../metadata/overlays/db/kustomization.yaml | 6 + .../overlays/db/metadata-db-deployment.yaml | 3 +- .../metadata/overlays/db/metadata-db-pvc.yaml | 2 +- .../overlays/db/metadata-db-service.yaml | 2 +- .../db/patches/metadata-grpc-deployment.yaml | 23 +-- .../scheduled-workflow-crd.yaml | 27 +++- .../pipeline/cluster-scoped/viewer-crd.yaml | 22 ++- .../base/pipeline/container-builder-sa.yaml | 2 +- .../base/pipeline/kfp-launcher-configmap.yaml | 4 +- .../upstream/base/pipeline/kustomization.yaml | 12 +- .../metadata-writer/kustomization.yaml | 2 +- .../metadata-writer-deployment.yaml | 2 +- .../metadata-writer/metadata-writer-role.yaml | 2 +- .../metadata-writer-rolebinding.yaml | 4 +- .../metadata-writer/metadata-writer-sa.yaml | 2 +- .../ml-pipeline-apiserver-deployment.yaml | 26 +-- .../pipeline/ml-pipeline-apiserver-role.yaml | 2 +- .../ml-pipeline-apiserver-rolebinding.yaml | 4 +- .../pipeline/ml-pipeline-apiserver-sa.yaml | 2 +- .../ml-pipeline-apiserver-service.yaml | 8 +- ...-pipeline-persistenceagent-deployment.yaml | 18 +-- .../ml-pipeline-persistenceagent-role.yaml | 4 +- ...pipeline-persistenceagent-rolebinding.yaml | 2 +- .../ml-pipeline-persistenceagent-sa.yaml | 4 +- ...pipeline-scheduledworkflow-deployment.yaml | 20 +-- .../ml-pipeline-scheduledworkflow-role.yaml | 2 +- ...ipeline-scheduledworkflow-rolebinding.yaml | 4 +- .../ml-pipeline-scheduledworkflow-sa.yaml | 2 +- .../pipeline/ml-pipeline-ui-configmap.yaml | 4 +- .../pipeline/ml-pipeline-ui-deployment.yaml | 62 +++---- .../base/pipeline/ml-pipeline-ui-role.yaml | 2 +- .../pipeline/ml-pipeline-ui-rolebinding.yaml | 2 +- .../base/pipeline/ml-pipeline-ui-sa.yaml | 4 +- .../base/pipeline/ml-pipeline-ui-service.yaml | 2 +- .../ml-pipeline-viewer-crd-deployment.yaml | 2 +- .../pipeline/ml-pipeline-viewer-crd-role.yaml | 2 +- .../ml-pipeline-viewer-crd-rolebinding.yaml | 2 +- .../pipeline/ml-pipeline-viewer-crd-sa.yaml | 2 +- .../ml-pipeline-visualization-deployment.yaml | 32 ++-- .../ml-pipeline-visualization-sa.yaml | 2 +- .../ml-pipeline-visualization-service.yaml | 4 +- .../base/pipeline/pipeline-runner-role.yaml | 2 +- .../pipeline/pipeline-runner-rolebinding.yaml | 2 +- .../base/pipeline/pipeline-runner-sa.yaml | 2 +- .../upstream/base/pipeline/viewer-sa.yaml | 2 +- .../kustomization.yaml | 2 + .../cluster-scoped-resources/namespace.yaml | 2 +- .../env/aws/aws-configuration-patch.yaml | 7 +- .../upstream/env/azure/kustomization.yaml | 4 + .../minio-azure-gateway/kustomization.yaml | 4 +- .../minio-azure-gateway-deployment.yaml | 2 +- .../minio-azure-gateway-service.yaml | 4 +- .../upstream/env/dev/kustomization.yaml | 3 + .../cloudsql-proxy-deployment.yaml | 53 +++++- .../gcp/cloudsql-proxy/cloudsql-proxy-sa.yaml | 2 +- .../env/gcp/cloudsql-proxy/kustomization.yaml | 1 + .../env/gcp/cloudsql-proxy/mysql-service.yaml | 2 +- .../env/gcp/gcp-configurations-patch.yaml | 2 +- .../env/gcp/inverse-proxy/kustomization.yaml | 2 +- .../gcp/inverse-proxy/proxy-configmap.yaml | 2 +- .../gcp/inverse-proxy/proxy-deployment.yaml | 2 +- .../env/gcp/inverse-proxy/proxy-role.yaml | 4 +- .../gcp/inverse-proxy/proxy-rolebinding.yaml | 2 +- .../env/gcp/inverse-proxy/proxy-sa.yaml | 2 +- .../upstream/env/gcp/kustomization.yaml | 5 + .../gcp/minio-gcs-gateway/kustomization.yaml | 2 + .../minio-gcs-gateway-deployment.yaml | 4 +- .../minio-gcs-gateway-sa.yaml | 2 +- .../minio-gcs-gateway-service.yaml | 4 +- .../kustomization.yaml | 1 + .../workflow-controller-configmap-patch.yaml | 2 +- .../kustomization.yaml | 1 + .../workflow-controller-configmap-patch.yaml | 2 +- .../kustomization.yaml | 3 + .../kustomization.yaml | 1 + .../workflow-controller-configmap-patch.yaml | 2 +- .../kustomization.yaml | 3 + .../platform-agnostic-pns/kustomization.yaml | 1 + .../workflow-controller-configmap-patch.yaml | 2 +- .../env/platform-agnostic/kustomization.yaml | 3 + .../kustomization.yaml | 2 + .../upstream/sample/kustomization.yaml | 5 + .../application-controller-deployment.yaml | 14 +- .../application-controller-role.yaml | 4 +- .../application-controller-rolebinding.yaml | 2 +- .../application-controller-sa.yaml | 2 +- .../application-controller-service.yaml | 4 +- .../cluster-scoped/application-crd.yaml | 2 +- .../application/kustomization.yaml | 1 + .../third-party/argo/base/kustomization.yaml | 3 + .../workflow-controller-configmap-patch.yaml | 3 +- .../workflow-controller-deployment-patch.yaml | 2 +- .../argo/installs/cluster/kustomization.yaml | 4 +- .../installs/namespace/kustomization.yaml | 3 + .../grafana/grafana-deployment.yaml | 4 +- .../third-party/grafana/grafana-role.yaml | 2 +- .../grafana/grafana-rolebinding.yaml | 2 +- .../third-party/grafana/grafana-sa.yaml | 2 +- .../third-party/grafana/grafana-service.yaml | 2 +- .../third-party/grafana/kustomization.yaml | 4 +- .../base/cluster-role-binding.yaml | 2 +- .../third-party/metacontroller/base/crd.yaml | 7 +- .../metacontroller/base/kustomization.yaml | 4 - .../metacontroller/base/service-account.yaml | 2 +- .../metacontroller/base/stateful-set.yaml | 44 ++--- .../third-party/minio/base/kustomization.yaml | 1 + .../minio/base/minio-deployment.yaml | 2 +- .../third-party/minio/base/minio-pvc.yaml | 2 +- .../third-party/minio/base/minio-service.yaml | 2 +- .../mlpipeline-minio-artifact-secret.yaml | 2 +- .../istio/istio-authorization-policy.yaml | 4 +- .../minio/options/istio/kustomization.yaml | 1 + .../third-party/mysql/base/kustomization.yaml | 1 + .../mysql/base/mysql-deployment.yaml | 8 +- .../mysql/base/mysql-pv-claim.yaml | 2 +- .../third-party/mysql/base/mysql-service.yaml | 2 +- .../mysql/base/mysql-serviceaccount.yaml | 3 +- .../istio/istio-authorization-policy.yaml | 6 +- .../mysql/options/istio/kustomization.yaml | 1 + .../third-party/prometheus/kustomization.yaml | 2 +- .../prometheus/prometheus-configmap.yaml | 4 +- .../prometheus/prometheus-deployment.yaml | 20 +-- .../prometheus/prometheus-role.yaml | 2 +- .../prometheus/prometheus-rolebinding.yaml | 2 +- .../third-party/prometheus/prometheus-sa.yaml | 2 +- .../prometheus/prometheus-service.yaml | 2 +- 188 files changed, 698 insertions(+), 451 deletions(-) diff --git a/acm-repos/kfp-standalone-1/kfp-all.yaml b/acm-repos/kfp-standalone-1/kfp-all.yaml index 3de1f5129..d5dcfadba 100644 --- a/acm-repos/kfp-standalone-1/kfp-all.yaml +++ b/acm-repos/kfp-standalone-1/kfp-all.yaml @@ -89,6 +89,85 @@ spec: --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition +metadata: + labels: + application-crd-id: kubeflow-pipelines + name: scheduledworkflows.kubeflow.org +spec: + group: kubeflow.org + names: + kind: ScheduledWorkflow + listKind: ScheduledWorkflowList + plural: scheduledworkflows + shortNames: + - swf + singular: scheduledworkflow + scope: Namespaced + versions: + - name: v1beta1 + schema: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + x-kubernetes-map-type: atomic + x-kubernetes-preserve-unknown-fields: true + status: + type: object + x-kubernetes-map-type: atomic + x-kubernetes-preserve-unknown-fields: true + required: + - spec + - status + type: object + served: true + storage: true +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + labels: + application-crd-id: kubeflow-pipelines + name: viewers.kubeflow.org +spec: + group: kubeflow.org + names: + kind: Viewer + listKind: ViewerList + plural: viewers + shortNames: + - vi + singular: viewer + scope: Namespaced + versions: + - name: v1beta1 + schema: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + x-kubernetes-map-type: atomic + x-kubernetes-preserve-unknown-fields: true + required: + - spec + type: object + served: true + storage: true +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition metadata: labels: application-crd-id: kubeflow-pipelines @@ -452,48 +531,6 @@ spec: type: object version: v1beta1 --- -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: scheduledworkflows.kubeflow.org -spec: - group: kubeflow.org - names: - kind: ScheduledWorkflow - listKind: ScheduledWorkflowList - plural: scheduledworkflows - shortNames: - - swf - singular: scheduledworkflow - scope: Namespaced - versions: - - name: v1beta1 - served: true - storage: true ---- -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: viewers.kubeflow.org -spec: - group: kubeflow.org - names: - kind: Viewer - listKind: ViewerList - plural: viewers - shortNames: - - vi - singular: viewer - scope: Namespaced - versions: - - name: v1beta1 - served: true - storage: true ---- apiVersion: v1 kind: ServiceAccount metadata: @@ -1455,7 +1492,7 @@ apiVersion: v1 data: ConMaxLifeTime: 120s appName: kfp-standalone-1 - appVersion: 1.7.1 + appVersion: 1.8.0-alpha.0 autoUpdatePipelineDefaultVersion: "true" bucketName: mlpipeline cacheDb: cachedb @@ -1675,6 +1712,10 @@ spec: apiVersion: v1 kind: Service metadata: + annotations: + prometheus.io/port: "8888" + prometheus.io/scheme: http + prometheus.io/scrape: "true" labels: application-crd-id: kubeflow-pipelines name: ml-pipeline @@ -1755,7 +1796,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/cache-deployer:1.7.1 + image: gcr.io/ml-pipeline/cache-deployer:1.8.0-alpha.0 imagePullPolicy: Always name: main restartPolicy: Always @@ -1832,7 +1873,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/cache-server:1.7.1 + image: gcr.io/ml-pipeline/cache-server:1.8.0-alpha.0 imagePullPolicy: Always name: server ports: @@ -1917,7 +1958,7 @@ spec: component: metadata-envoy spec: containers: - - image: gcr.io/ml-pipeline/metadata-envoy:1.7.1 + - image: gcr.io/ml-pipeline/metadata-envoy:1.8.0-alpha.0 name: container ports: - containerPort: 9090 @@ -1982,7 +2023,7 @@ spec: configMapKeyRef: key: dbPort name: pipeline-install-config - image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.0.0 + image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.4.0 livenessProbe: initialDelaySeconds: 3 periodSeconds: 5 @@ -2027,7 +2068,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/metadata-writer:1.7.1 + image: gcr.io/ml-pipeline/metadata-writer:1.8.0-alpha.0 name: main serviceAccountName: kubeflow-pipelines-metadata-writer --- @@ -2115,7 +2156,7 @@ spec: value: "86400" - name: NUM_WORKERS value: "2" - image: gcr.io/ml-pipeline/persistenceagent:1.7.1 + image: gcr.io/ml-pipeline/persistenceagent:1.8.0-alpha.0 imagePullPolicy: IfNotPresent name: ml-pipeline-persistenceagent resources: @@ -2156,7 +2197,7 @@ spec: configMapKeyRef: key: cronScheduleTimezone name: pipeline-install-config - image: gcr.io/ml-pipeline/scheduledworkflow:1.7.1 + image: gcr.io/ml-pipeline/scheduledworkflow:1.8.0-alpha.0 imagePullPolicy: IfNotPresent name: ml-pipeline-scheduledworkflow serviceAccountName: ml-pipeline-scheduledworkflow @@ -2202,7 +2243,7 @@ spec: name: mlpipeline-minio-artifact - name: ALLOW_CUSTOM_VISUALIZATIONS value: "true" - image: gcr.io/ml-pipeline/frontend:1.7.1 + image: gcr.io/ml-pipeline/frontend:1.8.0-alpha.0 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2274,7 +2315,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/viewer-crd-controller:1.7.1 + image: gcr.io/ml-pipeline/viewer-crd-controller:1.8.0-alpha.0 imagePullPolicy: Always name: ml-pipeline-viewer-crd serviceAccountName: ml-pipeline-viewer-crd-service-account @@ -2301,7 +2342,7 @@ spec: application-crd-id: kubeflow-pipelines spec: containers: - - image: gcr.io/ml-pipeline/visualization-server:1.7.1 + - image: gcr.io/ml-pipeline/visualization-server:1.8.0-alpha.0 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2416,7 +2457,7 @@ spec: secretKeyRef: key: secretkey name: mlpipeline-minio-artifact - image: gcr.io/ml-pipeline/api-server:1.7.1 + image: gcr.io/ml-pipeline/api-server:1.8.0-alpha.0 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2524,7 +2565,7 @@ spec: - env: - name: PROXY_URL value: https://datalab-staging.cloud.google.com/tun/m/4592f092208ecc84946b8f8f8016274df1b36a14 - image: gcr.io/ml-pipeline/inverse-proxy-agent:1.7.1 + image: gcr.io/ml-pipeline/inverse-proxy-agent:1.8.0-alpha.0 imagePullPolicy: IfNotPresent name: proxy-agent hostNetwork: true @@ -2634,7 +2675,7 @@ spec: url: https://github.com/kubeflow/pipelines notes: Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters). type: Kubeflow Pipelines - version: 1.7.1 + version: 1.8.0-alpha.0 info: - name: Console value: https://console.cloud.google.com/ai-platform/pipelines/clusters diff --git a/test-infra/kfp/Makefile b/test-infra/kfp/Makefile index 316b94a3f..872765f97 100644 --- a/test-infra/kfp/Makefile +++ b/test-infra/kfp/Makefile @@ -16,7 +16,7 @@ KFP_STANDALONE_1_DIR=$(ACM_REPOS)/kfp-standalone-1 # Please edit the following version before running: # make kfp-update -PIPELINES_VERSION=1.7.1 +PIPELINES_VERSION=1.8.0-alpha.0 PIPELINES_SRC_REPO=https://github.com/kubeflow/pipelines.git all: hydrate hydrate-kfp-manifests vet-kfp-manifests diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile index 5d9ef664d..f6d4d2fdb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile @@ -1,18 +1,11 @@ -apiVersion: kpt.dev/v1 +apiVersion: kpt.dev/v1alpha1 kind: Kptfile metadata: name: upstream upstream: type: git git: + commit: ca9b9444ac879666f6ab9e11f82a62a7890f4373 repo: https://github.com/kubeflow/pipelines directory: /manifests/kustomize - ref: 1.7.1 - updateStrategy: resource-merge -upstreamLock: - type: git - git: - repo: https://github.com/kubeflow/pipelines - directory: /manifests/kustomize - ref: 1.7.1 - commit: d8e2f0d557c1cf233730ba8ee69d9aed8e0c6e19 + ref: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS index 9ada1cf71..a99099068 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS @@ -1,5 +1,5 @@ approvers: - - Bobgy - - IronPan + - zijianjoy reviewers: - Bobgy + - zijianjoy diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/application/application.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/application/application.yaml index 64348f3f4..1af2f9b43 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/application/application.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/application/application.yaml @@ -2,7 +2,7 @@ apiVersion: app.k8s.io/v1beta1 kind: Application -metadata: # kpt-merge: /$(kfp-app-name) +metadata: name: $(kfp-app-name) annotations: kubernetes-engine.cloud.google.com/icon: >- @@ -28,6 +28,7 @@ spec: url: https://www.kubeflow.org/docs/pipelines/ notes: |- Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters). + info: - name: Console value: 'https://console.cloud.google.com/ai-platform/pipelines/clusters' diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-deployment.yaml index 703c1d92b..d4c3ae3a8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /cache-deployer-deployment +metadata: name: cache-deployer-deployment labels: app: cache-deployer diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-role.yaml index ca6ac6395..f853a3212 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-role +metadata: labels: app: kubeflow-pipelines-cache-deployer-role name: kubeflow-pipelines-cache-deployer-role diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-rolebinding.yaml index d841e9c8c..824a95726 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cache-deployer-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-rolebinding +metadata: name: kubeflow-pipelines-cache-deployer-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io @@ -8,4 +8,4 @@ roleRef: name: kubeflow-pipelines-cache-deployer-role subjects: - kind: ServiceAccount - name: kubeflow-pipelines-cache-deployer-sa + name: kubeflow-pipelines-cache-deployer-sa \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrole.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrole.yaml index b725a8a23..bb58deaf0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrole.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrole.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrole +metadata: labels: app: kubeflow-pipelines-cache-deployer-clusterrole name: kubeflow-pipelines-cache-deployer-clusterrole @@ -32,4 +32,4 @@ rules: resourceNames: - kubernetes.io/* verbs: - - approve + - approve diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml index 0f37be2e1..c0f19d757 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrolebinding +metadata: name: kubeflow-pipelines-cache-deployer-clusterrolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-sa.yaml index 429fce7a7..affada3d1 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/cache-deployer-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-sa +metadata: name: kubeflow-pipelines-cache-deployer-sa diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/kustomization.yaml index ebecdc893..2b941ae3f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/cluster-scoped/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - cache-deployer-clusterrole.yaml - cache-deployer-clusterrolebinding.yaml @@ -7,3 +8,4 @@ resources: # Presence of a SA referred by a clusterrolebinding allows kustomize to auto-add # namespace for the clusterrolebinding's SA ref. - cache-deployer-sa.yaml + \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/kustomization.yaml index 2e1583b37..b7f7379b9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache-deployer/kustomization.yaml @@ -8,4 +8,4 @@ commonLabels: app: cache-deployer images: - name: gcr.io/ml-pipeline/cache-deployer - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-deployment.yaml index 5d112653d..58512e1e6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /cache-server +metadata: name: cache-server labels: app: cache-server @@ -18,48 +18,55 @@ spec: - name: server image: gcr.io/ml-pipeline/cache-server:dummy env: - - name: CACHE_IMAGE - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: cacheImage - - name: CACHE_NODE_RESTRICTIONS - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: cacheNodeRestrictions - - name: DBCONFIG_DRIVER - value: mysql - - name: DBCONFIG_DB_NAME - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: cacheDb - - name: DBCONFIG_HOST_NAME - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: dbHost - - name: DBCONFIG_PORT - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: dbPort - - name: DBCONFIG_USER - valueFrom: - secretKeyRef: - name: mysql-secret - key: username - - name: DBCONFIG_PASSWORD - valueFrom: - secretKeyRef: - name: mysql-secret - key: password - - name: NAMESPACE_TO_WATCH - valueFrom: - fieldRef: - fieldPath: metadata.namespace - args: ["--db_driver=$(DBCONFIG_DRIVER)", "--db_host=$(DBCONFIG_HOST_NAME)", "--db_port=$(DBCONFIG_PORT)", "--db_name=$(DBCONFIG_DB_NAME)", "--db_user=$(DBCONFIG_USER)", "--db_password=$(DBCONFIG_PASSWORD)", "--namespace_to_watch=$(NAMESPACE_TO_WATCH)"] + - name: CACHE_IMAGE + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: cacheImage + - name: CACHE_NODE_RESTRICTIONS + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: cacheNodeRestrictions + - name: DBCONFIG_DRIVER + value: mysql + - name: DBCONFIG_DB_NAME + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: cacheDb + - name: DBCONFIG_HOST_NAME + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: dbHost + - name: DBCONFIG_PORT + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: dbPort + - name: DBCONFIG_USER + valueFrom: + secretKeyRef: + name: mysql-secret + key: username + - name: DBCONFIG_PASSWORD + valueFrom: + secretKeyRef: + name: mysql-secret + key: password + - name: NAMESPACE_TO_WATCH + valueFrom: + fieldRef: + fieldPath: metadata.namespace + args: ["--db_driver=$(DBCONFIG_DRIVER)", + "--db_host=$(DBCONFIG_HOST_NAME)", + "--db_port=$(DBCONFIG_PORT)", + "--db_name=$(DBCONFIG_DB_NAME)", + "--db_user=$(DBCONFIG_USER)", + "--db_password=$(DBCONFIG_PASSWORD)", + "--namespace_to_watch=$(NAMESPACE_TO_WATCH)", + ] imagePullPolicy: Always ports: - containerPort: 8443 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-role.yaml index af71b5fde..de613b427 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /kubeflow-pipelines-cache-role +metadata: labels: app: kubeflow-pipelines-cache-role name: kubeflow-pipelines-cache-role diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-rolebinding.yaml index 52093fbab..9c8924918 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-cache-binding +metadata: name: kubeflow-pipelines-cache-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -8,4 +8,4 @@ roleRef: name: kubeflow-pipelines-cache-role subjects: - kind: ServiceAccount - name: kubeflow-pipelines-cache + name: kubeflow-pipelines-cache \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-sa.yaml index 556377caa..232ddd15c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-cache +metadata: name: kubeflow-pipelines-cache diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-service.yaml index 01f78de2e..5916d541e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/cache-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /cache-server +metadata: name: cache-server spec: selector: app: cache-server ports: - port: 443 - targetPort: webhook-api + targetPort: webhook-api \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/kustomization.yaml index 70fe78c06..8b70cf666 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/cache/kustomization.yaml @@ -10,4 +10,4 @@ commonLabels: app: cache-server images: - name: gcr.io/ml-pipeline/cache-server - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/mysql-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/mysql-secret.yaml index 3ab9eb240..576dce6f5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/mysql-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/mysql-secret.yaml @@ -1,6 +1,6 @@ kind: Secret apiVersion: v1 -metadata: # kpt-merge: /mysql-secret +metadata: name: mysql-secret stringData: username: root diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml index 61566e4d4..82ea18366 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /pipeline-install-config +metadata: name: pipeline-install-config data: warning: | @@ -11,7 +11,7 @@ data: until the changes take effect. A quick way to restart all deployments in a namespace: `kubectl rollout restart deployment -n `. appName: pipeline - appVersion: 1.7.1 + appVersion: 1.8.0-alpha.0 dbHost: mysql dbPort: "3306" mlmdDb: metadb diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role-binding.yaml index c9e1498c8..9927d3e10 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role.yaml index ca0fbe51b..957a001dd 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/deployment-patch.yaml index 8cfc52c2e..4f283cd3e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/kustomization.yaml index 20141b338..4650ab569 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/api-service/kustomization.yaml @@ -5,5 +5,5 @@ resources: - cluster-role.yaml configMapGenerator: - name: pipeline-api-server-config - envs: + envs: - params.env diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role-binding.yaml index d077a1eb4..4e80257c2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-cache-binding +metadata: name: kubeflow-pipelines-cache-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role.yaml index 413753be8..e60436735 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /kubeflow-pipelines-cache-role +metadata: name: kubeflow-pipelines-cache-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/deployment-patch.yaml index 4a5f5fa67..5f98ee136 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/cache/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /cache-server +metadata: name: cache-server spec: template: @@ -8,6 +8,6 @@ spec: containers: - name: server env: - - name: NAMESPACE_TO_WATCH - value: '' - valueFrom: null + - name: NAMESPACE_TO_WATCH + value: '' + valueFrom: null diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/istio-authorization-config.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/istio-authorization-config.yaml index 1c417754b..a9a45e5eb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/istio-authorization-config.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/istio-authorization-config.yaml @@ -1,6 +1,6 @@ apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: kubeflow/ml-pipeline-ui +metadata: name: ml-pipeline-ui namespace: kubeflow spec: @@ -15,7 +15,7 @@ spec: --- apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: kubeflow/ml-pipeline +metadata: name: ml-pipeline namespace: kubeflow spec: @@ -39,7 +39,7 @@ spec: --- apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: kubeflow/ml-pipeline-visualizationserver +metadata: name: ml-pipeline-visualizationserver namespace: kubeflow spec: @@ -56,10 +56,11 @@ spec: - cluster.local/ns/kubeflow/sa/ml-pipeline-scheduledworkflow - cluster.local/ns/kubeflow/sa/ml-pipeline-viewer-crd-service-account - cluster.local/ns/kubeflow/sa/kubeflow-pipelines-cache + --- apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: kubeflow/service-cache-server +metadata: name: service-cache-server namespace: kubeflow spec: @@ -68,10 +69,11 @@ spec: app: cache-server rules: - {} + --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui spec: host: ml-pipeline-ui.kubeflow.svc.cluster.local @@ -81,7 +83,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline spec: host: ml-pipeline.kubeflow.svc.cluster.local @@ -91,7 +93,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: # kpt-merge: /ml-pipeline-visualizationserver +metadata: name: ml-pipeline-visualizationserver spec: host: ml-pipeline-visualizationserver.kubeflow.svc.cluster.local diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/kustomization.yaml index e83a5eaf9..72ebaf7ea 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/kustomization.yaml @@ -28,5 +28,6 @@ patchesStrategicMerge: - persistence-agent/deployment-patch.yaml - metadata-writer/deployment-patch.yaml - cache/deployment-patch.yaml + configurations: - params.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role-binding.yaml index 8fb05e7af..605f1ff0d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-binding +metadata: name: kubeflow-pipelines-metadata-writer-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role.yaml index b9aa12bd7..a6ec98672 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-role +metadata: name: kubeflow-pipelines-metadata-writer-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/deployment-patch.yaml index 5046300c9..2babe9f43 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/metadata-writer/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-writer +metadata: name: metadata-writer spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role-binding.yaml index b975eb16f..e030bd8a0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /ml-pipeline-persistenceagent-binding +metadata: name: ml-pipeline-persistenceagent-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role.yaml index 2660b25ae..b3053317b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /ml-pipeline-persistenceagent-role +metadata: name: ml-pipeline-persistenceagent-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/deployment-patch.yaml index e1198c575..1e165def4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/persistence-agent/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-persistenceagent +metadata: name: ml-pipeline-persistenceagent spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/composite-controller.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/composite-controller.yaml index 9fe5179ed..c363defc2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/composite-controller.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/composite-controller.yaml @@ -1,13 +1,18 @@ +# Change resyncPeriodSeconds to 1 hour from insane 20 seconds +# Only sync namespaces with pipelines.kubeflow.org/enabled = "true" apiVersion: metacontroller.k8s.io/v1alpha1 kind: CompositeController -metadata: # kpt-merge: /kubeflow-pipelines-profile-controller +metadata: name: kubeflow-pipelines-profile-controller spec: generateSelector: true - resyncPeriodSeconds: 10 + resyncPeriodSeconds: 3600 parentResource: apiVersion: v1 resource: namespaces + labelSelector: + matchLabels: + pipelines.kubeflow.org/enabled = "true" childResources: - apiVersion: v1 resource: secrets diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/deployment.yaml index 94a18e9ef..99dd9e21c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /kubeflow-pipelines-profile-controller +metadata: name: kubeflow-pipelines-profile-controller spec: replicas: 1 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/service.yaml index 49f4cccf7..9c5316ddf 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /kubeflow-pipelines-profile-controller +metadata: name: kubeflow-pipelines-profile-controller spec: ports: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role-binding.yaml index 838a290b3..3539ff107 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role.yaml index 8b9a24dcd..dc352c941 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/configmap-patch.yaml index 033313b02..11f1f551b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/configmap-patch.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /ml-pipeline-ui-configmap +metadata: name: ml-pipeline-ui-configmap data: - # Temporary workarounds: - # 1. Using default-editor because default-viewer isn't bound to workload identity - viewer-pod-template.json: |- + # Temporary workarounds: + # 1. Using default-editor because default-viewer isn't bound to workload identity + viewer-pod-template.json: |- { "spec": { "serviceAccountName": "default-editor" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/deployment-patch.yaml index 7c27ed684..0403cc362 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/pipelines-ui/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role-binding.yaml index 2ceca575e..0495d0017 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-binding +metadata: name: ml-pipeline-scheduledworkflow-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role.yaml index e2846ad95..d08722c21 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-role +metadata: name: ml-pipeline-scheduledworkflow-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/deployment-patch.yaml index 157816f9b..ea35690d8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/scheduled-workflow/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow +metadata: name: ml-pipeline-scheduledworkflow spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/view-edit-cluster-roles.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/view-edit-cluster-roles.yaml index 74b3550dc..626e005a9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/view-edit-cluster-roles.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/view-edit-cluster-roles.yaml @@ -1,6 +1,12 @@ +# NOTE: IMPORTANT +# We need to separate out actual rules from aggregation rules due to +# https://github.com/kubernetes/kubernetes/issues/65171 +# TL;DR: We can't have both aggregation and rules in a [Cluster]Role. When that +# is the case, the rules get ignored. +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /kubeflow-pipelines-edit +metadata: labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" name: kubeflow-pipelines-edit @@ -9,10 +15,12 @@ aggregationRule: - matchLabels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" rules: [] + --- + apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /kubeflow-pipelines-view +metadata: labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" @@ -22,10 +30,12 @@ aggregationRule: - matchLabels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-view: "true" rules: [] + --- + apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /aggregate-to-kubeflow-pipelines-edit +metadata: labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" name: aggregate-to-kubeflow-pipelines-edit @@ -68,10 +78,29 @@ rules: - delete - disable - enable +- apiGroups: + - kubeflow.org + verbs: + - '*' + resources: + - scheduledworkflows +- apiGroups: + - argoproj.io + verbs: + - '*' + resources: + - cronworkflows + - cronworkflows/finalizers + - workflows + - workflows/finalizers + - workfloweventbindings + - workflowtemplates + --- + apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /aggregate-to-kubeflow-pipelines-view +metadata: labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-view: "true" name: aggregate-to-kubeflow-pipelines-view diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role-binding.yaml index 1dcc35670..5e325bfc6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /ml-pipeline-viewer-crd-binding +metadata: name: ml-pipeline-viewer-crd-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role.yaml index 7c3db1a3e..9e9b68a2c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/cluster-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: # kpt-merge: /ml-pipeline-viewer-controller-role +metadata: name: ml-pipeline-viewer-controller-role rules: - apiGroups: @@ -20,6 +20,7 @@ rules: - kubeflow.org resources: - viewers + - viewers/finalizers verbs: - create - get diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/deployment-patch.yaml index 1646700a8..73e5d1050 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/viewer-controller/deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-viewer-crd +metadata: name: ml-pipeline-viewer-crd spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/virtual-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/virtual-service.yaml index a0ad4a21a..2b7991a9a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/virtual-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/installs/multi-user/virtual-service.yaml @@ -1,6 +1,6 @@ apiVersion: networking.istio.io/v1alpha3 kind: VirtualService -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui spec: gateways: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/kustomization.yaml index 562ece2b7..8bb654a91 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: - metadata-grpc-sa.yaml images: - name: gcr.io/ml-pipeline/metadata-envoy - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-deployment.yaml index 981fc0428..e087d80aa 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-envoy-deployment +metadata: name: metadata-envoy-deployment labels: component: metadata-envoy diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-service.yaml index 22f5f3229..42166c85c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-envoy-service.yaml @@ -1,6 +1,6 @@ kind: Service apiVersion: v1 -metadata: # kpt-merge: /metadata-envoy-service +metadata: labels: app: metadata-envoy name: metadata-envoy-service diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-configmap.yaml index 7c1e933e5..08cc7e692 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /metadata-grpc-configmap +metadata: name: metadata-grpc-configmap labels: component: metadata-grpc-server diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-deployment.yaml index 1b678e62a..131dbdba5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-grpc-deployment +metadata: name: metadata-grpc-deployment labels: component: metadata-grpc-server @@ -22,7 +22,7 @@ spec: # * .cloudbuild.yaml and .release.cloudbuild.yaml # * manifests/kustomize/base/metadata/base/metadata-grpc-deployment.yaml # * test/tag_for_hosted.sh - image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.0.0 + image: gcr.io/tfx-oss-public/ml_metadata_store_server:1.4.0 env: - name: DBCONFIG_USER valueFrom: @@ -50,7 +50,14 @@ spec: name: pipeline-install-config key: dbPort command: ["/bin/metadata_store_server"] - args: ["--grpc_port=8080", "--mysql_config_database=$(MYSQL_DATABASE)", "--mysql_config_host=$(MYSQL_HOST)", "--mysql_config_port=$(MYSQL_PORT)", "--mysql_config_user=$(DBCONFIG_USER)", "--mysql_config_password=$(DBCONFIG_PASSWORD)", "--enable_database_upgrade=true"] + args: ["--grpc_port=8080", + "--mysql_config_database=$(MYSQL_DATABASE)", + "--mysql_config_host=$(MYSQL_HOST)", + "--mysql_config_port=$(MYSQL_PORT)", + "--mysql_config_user=$(DBCONFIG_USER)", + "--mysql_config_password=$(DBCONFIG_PASSWORD)", + "--enable_database_upgrade=true" + ] ports: - name: grpc-api containerPort: 8080 @@ -67,3 +74,4 @@ spec: periodSeconds: 5 timeoutSeconds: 2 serviceAccountName: metadata-grpc-server + diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-sa.yaml index 5ba79faa6..c8e8d1fc8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /metadata-grpc-server +metadata: name: metadata-grpc-server diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-service.yaml index 276d499e3..7e7b73bf0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/base/metadata-grpc-service.yaml @@ -1,6 +1,6 @@ kind: Service apiVersion: v1 -metadata: # kpt-merge: /metadata-grpc-service +metadata: labels: app: metadata name: metadata-grpc-service diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/destination-rule.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/destination-rule.yaml index 9837114c6..e2ce8ca97 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/destination-rule.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/destination-rule.yaml @@ -1,6 +1,6 @@ apiVersion: networking.istio.io/v1alpha3 kind: DestinationRule -metadata: # kpt-merge: /metadata-grpc-service +metadata: name: metadata-grpc-service spec: host: metadata-grpc-service.kubeflow.svc.cluster.local diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/istio-authorization-policy.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/istio-authorization-policy.yaml index 1d17e145f..8f41789e8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/istio-authorization-policy.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/istio-authorization-policy.yaml @@ -1,6 +1,6 @@ apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: /metadata-grpc-service +metadata: name: metadata-grpc-service spec: action: ALLOW diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/kustomization.yaml index 0127f00a5..029a6937c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - istio-authorization-policy.yaml - destination-rule.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/virtual-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/virtual-service.yaml index 68233816f..01e000b65 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/virtual-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/options/istio/virtual-service.yaml @@ -1,6 +1,6 @@ apiVersion: networking.istio.io/v1alpha3 kind: VirtualService -metadata: # kpt-merge: kubeflow/metadata-grpc +metadata: name: metadata-grpc namespace: kubeflow spec: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/kustomization.yaml index 661a5653a..fa67b8a96 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/kustomization.yaml @@ -1,14 +1,17 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kubeflow + bases: - ../../base resources: - metadata-db-pvc.yaml - metadata-db-deployment.yaml - metadata-db-service.yaml + patchesStrategicMerge: - patches/metadata-grpc-deployment.yaml + configMapGenerator: - name: metadata-db-parameters envs: @@ -19,10 +22,13 @@ secretGenerator: - secrets.env generatorOptions: disableNameSuffixHash: true + + images: - name: mysql newName: mysql newTag: 8.0.3 + vars: - name: MLMD_DB_HOST objref: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-deployment.yaml index 9fe31708d..f5a7332f4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-db +metadata: name: metadata-db labels: component: db @@ -49,3 +49,4 @@ spec: - name: metadata-mysql persistentVolumeClaim: claimName: metadata-mysql + diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-pvc.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-pvc.yaml index 702f9218a..b1c083d9f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-pvc.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-pvc.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: PersistentVolumeClaim -metadata: # kpt-merge: /metadata-mysql +metadata: name: metadata-mysql spec: accessModes: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-service.yaml index d02a5f484..b7a640171 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/metadata-db-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /metadata-db +metadata: name: metadata-db labels: component: db diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/patches/metadata-grpc-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/patches/metadata-grpc-deployment.yaml index fb388715e..03023a340 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/patches/metadata-grpc-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/metadata/overlays/db/patches/metadata-grpc-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-grpc-deployment +metadata: name: metadata-grpc-deployment spec: template: @@ -9,12 +9,17 @@ spec: - name: container # Remove existing environment variables env: - - $patch: replace + - $patch: replace envFrom: - - configMapRef: - name: metadata-db-parameters - - secretRef: - name: metadata-db-secrets - - configMapRef: - name: metadata-grpc-configmap - args: ["--grpc_port=$(METADATA_GRPC_SERVICE_PORT)", "--mysql_config_host=$(MLMD_DB_HOST)", "--mysql_config_database=$(MYSQL_DATABASE)", "--mysql_config_port=$(MYSQL_PORT)", "--mysql_config_user=$(MYSQL_USER_NAME)", "--mysql_config_password=$(MYSQL_ROOT_PASSWORD)"] + - configMapRef: + name: metadata-db-parameters + - secretRef: + name: metadata-db-secrets + - configMapRef: + name: metadata-grpc-configmap + args: ["--grpc_port=$(METADATA_GRPC_SERVICE_PORT)", + "--mysql_config_host=$(MLMD_DB_HOST)", + "--mysql_config_database=$(MYSQL_DATABASE)", + "--mysql_config_port=$(MYSQL_PORT)", + "--mysql_config_user=$(MYSQL_USER_NAME)", + "--mysql_config_password=$(MYSQL_ROOT_PASSWORD)"] diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/scheduled-workflow-crd.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/scheduled-workflow-crd.yaml index 985b79711..6df65578f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/scheduled-workflow-crd.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/scheduled-workflow-crd.yaml @@ -1,6 +1,6 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: # kpt-merge: /scheduledworkflows.kubeflow.org +metadata: name: scheduledworkflows.kubeflow.org spec: group: kubeflow.org @@ -8,11 +8,32 @@ spec: kind: ScheduledWorkflow listKind: ScheduledWorkflowList plural: scheduledworkflows + singular: scheduledworkflow shortNames: - swf - singular: scheduledworkflow scope: Namespaced versions: - name: v1beta1 + schema: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + x-kubernetes-map-type: atomic + status: + type: object + x-kubernetes-preserve-unknown-fields: true + x-kubernetes-map-type: atomic + required: + - spec + - status + type: object served: true storage: true diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/viewer-crd.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/viewer-crd.yaml index 8b571d6cd..083a9e6b3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/viewer-crd.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/cluster-scoped/viewer-crd.yaml @@ -1,6 +1,6 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: # kpt-merge: /viewers.kubeflow.org +metadata: name: viewers.kubeflow.org spec: group: kubeflow.org @@ -8,11 +8,27 @@ spec: kind: Viewer listKind: ViewerList plural: viewers + singular: viewer shortNames: - vi - singular: viewer scope: Namespaced versions: - name: v1beta1 + schema: + openAPIV3Schema: + properties: + apiVersion: + type: string + kind: + type: string + metadata: + type: object + spec: + type: object + x-kubernetes-preserve-unknown-fields: true + x-kubernetes-map-type: atomic + required: + - spec + type: object served: true storage: true diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/container-builder-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/container-builder-sa.yaml index c24c31245..aa65bd9bb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/container-builder-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/container-builder-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-container-builder +metadata: name: kubeflow-pipelines-container-builder diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kfp-launcher-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kfp-launcher-configmap.yaml index 6a9829e0c..13f60514a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kfp-launcher-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kfp-launcher-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /kfp-launcher +metadata: name: kfp-launcher data: - defaultPipelineRoot: $(kfp-default-pipeline-root) + defaultPipelineRoot: $(kfp-default-pipeline-root) diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kustomization.yaml index eb9a05fbf..396f964cc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/kustomization.yaml @@ -37,14 +37,14 @@ resources: - kfp-launcher-configmap.yaml images: - name: gcr.io/ml-pipeline/api-server - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 - name: gcr.io/ml-pipeline/persistenceagent - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 - name: gcr.io/ml-pipeline/scheduledworkflow - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 - name: gcr.io/ml-pipeline/frontend - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 - name: gcr.io/ml-pipeline/viewer-crd-controller - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 - name: gcr.io/ml-pipeline/visualization-server - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/kustomization.yaml index 8d1d3fadb..9c877dd12 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/kustomization.yaml @@ -7,4 +7,4 @@ resources: - metadata-writer-sa.yaml images: - name: gcr.io/ml-pipeline/metadata-writer - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-deployment.yaml index 81e351ccd..c51903d35 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /metadata-writer +metadata: name: metadata-writer labels: app: metadata-writer diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-role.yaml index f7b698d0e..06317b084 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-role +metadata: labels: app: kubeflow-pipelines-metadata-writer-role name: kubeflow-pipelines-metadata-writer-role diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml index 5d5b3cf70..5a6c1fef2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-binding +metadata: name: kubeflow-pipelines-metadata-writer-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -8,4 +8,4 @@ roleRef: name: kubeflow-pipelines-metadata-writer-role subjects: - kind: ServiceAccount - name: kubeflow-pipelines-metadata-writer + name: kubeflow-pipelines-metadata-writer \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-sa.yaml index da7a704f7..77812949a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/metadata-writer-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer +metadata: name: kubeflow-pipelines-metadata-writer diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-deployment.yaml index 1d5e62279..a85b2a9d4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline +metadata: labels: app: ml-pipeline name: ml-pipeline @@ -84,24 +84,24 @@ spec: readinessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:8888/apis/v1beta1/healthz + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:8888/apis/v1beta1/healthz initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 livenessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:8888/apis/v1beta1/healthz + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:8888/apis/v1beta1/healthz initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-role.yaml index bef610a52..ab0ee6d2d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /ml-pipeline +metadata: labels: app: ml-pipeline name: ml-pipeline diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-rolebinding.yaml index d06151c40..c4ef4f5ff 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /ml-pipeline +metadata: labels: app: ml-pipeline name: ml-pipeline @@ -10,4 +10,4 @@ roleRef: name: ml-pipeline subjects: - kind: ServiceAccount - name: ml-pipeline + name: ml-pipeline \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-sa.yaml index b23ff8ed5..95ff3141e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-service.yaml index c77c2fa8a..51c4f857d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-apiserver-service.yaml @@ -1,7 +1,11 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline + annotations: + prometheus.io/port: "8888" + prometheus.io/scheme: http + prometheus.io/scrape: "true" spec: ports: - name: http @@ -13,4 +17,4 @@ spec: protocol: TCP targetPort: 8887 selector: - app: ml-pipeline + app: ml-pipeline \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-deployment.yaml index 330b73886..bc5032e51 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-persistenceagent +metadata: labels: app: ml-pipeline-persistenceagent name: ml-pipeline-persistenceagent @@ -17,14 +17,14 @@ spec: spec: containers: - env: - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: TTL_SECONDS_AFTER_WORKFLOW_FINISH - value: "86400" - - name: NUM_WORKERS - value: "2" + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TTL_SECONDS_AFTER_WORKFLOW_FINISH + value: "86400" + - name: NUM_WORKERS + value: "2" image: gcr.io/ml-pipeline/persistenceagent:dummy imagePullPolicy: IfNotPresent name: ml-pipeline-persistenceagent diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-role.yaml index f2e7e2c50..830ee8b14 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /ml-pipeline-persistenceagent-role +metadata: name: ml-pipeline-persistenceagent-role rules: - apiGroups: @@ -18,4 +18,4 @@ rules: verbs: - get - list - - watch + - watch \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-rolebinding.yaml index af6cd4724..a690f20cb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /ml-pipeline-persistenceagent-binding +metadata: name: ml-pipeline-persistenceagent-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-sa.yaml index df2fd3521..4725287b3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-persistenceagent-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline-persistenceagent - name: ml-pipeline-persistenceagent +metadata: + name: ml-pipeline-persistenceagent \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-deployment.yaml index 5b78a90e8..ac20e5736 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow +metadata: labels: app: ml-pipeline-scheduledworkflow name: ml-pipeline-scheduledworkflow @@ -20,13 +20,13 @@ spec: imagePullPolicy: IfNotPresent name: ml-pipeline-scheduledworkflow env: - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: CRON_SCHEDULE_TIMEZONE - valueFrom: - configMapKeyRef: - name: pipeline-install-config - key: cronScheduleTimezone + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CRON_SCHEDULE_TIMEZONE + valueFrom: + configMapKeyRef: + name: pipeline-install-config + key: cronScheduleTimezone serviceAccountName: ml-pipeline-scheduledworkflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-role.yaml index 6500a667d..187272a97 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-role +metadata: labels: app: ml-pipeline-scheduledworkflow-role name: ml-pipeline-scheduledworkflow-role diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-rolebinding.yaml index a1ebaea95..e9429f366 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-binding +metadata: name: ml-pipeline-scheduledworkflow-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -8,4 +8,4 @@ roleRef: name: ml-pipeline-scheduledworkflow-role subjects: - kind: ServiceAccount - name: ml-pipeline-scheduledworkflow + name: ml-pipeline-scheduledworkflow \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-sa.yaml index ae8663b18..285c13742 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-scheduledworkflow-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline-scheduledworkflow +metadata: name: ml-pipeline-scheduledworkflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-configmap.yaml index 0c22009a5..85b642297 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-configmap.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /ml-pipeline-ui-configmap +metadata: name: ml-pipeline-ui-configmap data: - viewer-pod-template.json: |- + viewer-pod-template.json: |- { "spec": { "serviceAccountName": "kubeflow-pipelines-viewer" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-deployment.yaml index 3bd96e87a..8e8923a36 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-ui +metadata: labels: app: ml-pipeline-ui name: ml-pipeline-ui @@ -30,45 +30,45 @@ spec: mountPath: /etc/config readOnly: true env: - - name: VIEWER_TENSORBOARD_POD_TEMPLATE_SPEC_PATH - value: /etc/config/viewer-pod-template.json - - name: MINIO_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: MINIO_ACCESS_KEY - valueFrom: - secretKeyRef: - name: mlpipeline-minio-artifact - key: accesskey - - name: MINIO_SECRET_KEY - valueFrom: - secretKeyRef: - name: mlpipeline-minio-artifact - key: secretkey - - name: ALLOW_CUSTOM_VISUALIZATIONS - value: "true" + - name: VIEWER_TENSORBOARD_POD_TEMPLATE_SPEC_PATH + value: /etc/config/viewer-pod-template.json + - name: MINIO_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: MINIO_ACCESS_KEY + valueFrom: + secretKeyRef: + name: mlpipeline-minio-artifact + key: accesskey + - name: MINIO_SECRET_KEY + valueFrom: + secretKeyRef: + name: mlpipeline-minio-artifact + key: secretkey + - name: ALLOW_CUSTOM_VISUALIZATIONS + value: "true" readinessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:3000/apis/v1beta1/healthz + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:3000/apis/v1beta1/healthz initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 livenessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:3000/apis/v1beta1/healthz + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:3000/apis/v1beta1/healthz initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-role.yaml index 030c35d2b..0fc42c94f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /ml-pipeline-ui +metadata: labels: app: ml-pipeline-ui name: ml-pipeline-ui diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-rolebinding.yaml index 86ed7c597..e82983542 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /ml-pipeline-ui +metadata: labels: app: ml-pipeline-ui name: ml-pipeline-ui diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-sa.yaml index 720c5eb98..06bc44538 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline-ui - name: ml-pipeline-ui +metadata: + name: ml-pipeline-ui \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-service.yaml index e6557a8a6..093ad8ca2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-ui-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /ml-pipeline-ui +metadata: labels: app: ml-pipeline-ui name: ml-pipeline-ui diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-deployment.yaml index 19ea7410c..617801d11 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-viewer-crd +metadata: labels: app: ml-pipeline-viewer-crd name: ml-pipeline-viewer-crd diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-role.yaml index f8be77628..73bf032fd 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /ml-pipeline-viewer-controller-role +metadata: name: ml-pipeline-viewer-controller-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-rolebinding.yaml index 15ee6ae56..bd1f77a83 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /ml-pipeline-viewer-crd-binding +metadata: name: ml-pipeline-viewer-crd-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-sa.yaml index 9836c35e7..5dd08f884 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-viewer-crd-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline-viewer-crd-service-account +metadata: name: ml-pipeline-viewer-crd-service-account diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-deployment.yaml index 5b61d6254..b6d1e1184 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-visualizationserver +metadata: labels: app: ml-pipeline-visualizationserver name: ml-pipeline-visualizationserver @@ -25,29 +25,29 @@ spec: readinessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:8888/ + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:8888/ initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 livenessProbe: exec: command: - - wget - - -q # quiet - - -S # show server response - - -O - - "-" # Redirect output to stdout - - http://localhost:8888/ + - wget + - -q # quiet + - -S # show server response + - -O + - "-" # Redirect output to stdout + - http://localhost:8888/ initialDelaySeconds: 3 periodSeconds: 5 timeoutSeconds: 2 resources: - requests: - cpu: 30m - memory: 500Mi + requests: + cpu: 30m + memory: 500Mi serviceAccountName: ml-pipeline-visualizationserver diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-sa.yaml index 605f8d357..e1bbc6ad2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /ml-pipeline-visualizationserver +metadata: name: ml-pipeline-visualizationserver diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-service.yaml index e91c88517..83c7dd675 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/ml-pipeline-visualization-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /ml-pipeline-visualizationserver +metadata: name: ml-pipeline-visualizationserver spec: ports: @@ -9,4 +9,4 @@ spec: protocol: TCP targetPort: 8888 selector: - app: ml-pipeline-visualizationserver + app: ml-pipeline-visualizationserver \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-role.yaml index 7eabde7c5..e81fd91a5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /pipeline-runner +metadata: name: pipeline-runner rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-rolebinding.yaml index 31b06d291..9adae6188 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /pipeline-runner-binding +metadata: name: pipeline-runner-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-sa.yaml index 2aa6ae76f..8cb2c669f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/pipeline-runner-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /pipeline-runner +metadata: name: pipeline-runner diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/viewer-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/viewer-sa.yaml index d9d986752..932133c82 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/viewer-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/viewer-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-viewer +metadata: name: kubeflow-pipelines-viewer diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/kustomization.yaml index eca72f5f3..df0f654c0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/kustomization.yaml @@ -1,6 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + namespace: kubeflow + resources: - namespace.yaml bases: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/namespace.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/namespace.yaml index db51415ff..3c65856e7 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/namespace.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/cluster-scoped-resources/namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace -metadata: # kpt-merge: /$(kfp-cluster-scoped-namespace) +metadata: name: '$(kfp-cluster-scoped-namespace)' diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/aws/aws-configuration-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/aws/aws-configuration-patch.yaml index f23e510d5..d008e3bc7 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/aws/aws-configuration-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/aws/aws-configuration-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline-ui +metadata: name: ml-pipeline-ui spec: template: @@ -25,10 +25,11 @@ spec: secretKeyRef: name: mlpipeline-minio-artifact key: secretkey + --- apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline spec: template: @@ -57,4 +58,4 @@ spec: key: minioServiceRegion - name: OBJECTSTORECONFIG_PORT value: "" - name: ml-pipeline-api-server + name: ml-pipeline-api-server \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/kustomization.yaml index f13bac28d..39b9c7d95 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/kustomization.yaml @@ -1,19 +1,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kubeflow + bases: - ../../base/installs/generic - ../../base/metadata/base - ../../third-party/argo/installs/namespace - minio-azure-gateway + configMapGenerator: - name: pipeline-install-config env: params.env behavior: merge + secretGenerator: - name: mysql-secret env: mysql-secret.env behavior: merge + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/kustomization.yaml index 80fcc8bef..db350a6f5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/kustomization.yaml @@ -1,11 +1,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - minio-azure-gateway-deployment.yaml - minio-azure-gateway-service.yaml + secretGenerator: - name: mlpipeline-minio-artifact env: minio-artifact-secret.env generatorOptions: # mlpipeline-minio-artifact needs to be referred by exact name - disableNameSuffixHash: true + disableNameSuffixHash: true \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-deployment.yaml index 825bddb74..56979c42e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /minio +metadata: name: minio labels: app: minio diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-service.yaml index 9b9c8dfe7..7dd181749 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/azure/minio-azure-gateway/minio-azure-gateway-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /minio-service +metadata: name: minio-service spec: ports: @@ -8,4 +8,4 @@ spec: targetPort: 9000 protocol: TCP selector: - app: minio + app: minio \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/dev/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/dev/kustomization.yaml index c719d1cd1..23030cea7 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/dev/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/dev/kustomization.yaml @@ -1,16 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: # Application controller is used to provide Google Cloud Console integration. - ../../third-party/application - ../../base/application - ../platform-agnostic - ../gcp/inverse-proxy + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # !!! If you want to customize the namespace, # please refer sample/cluster-scoped-resources to update the namespace for cluster-scoped-resources namespace: kubeflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-deployment.yaml index ca8c87b05..9ad38985d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /cloudsqlproxy +metadata: name: cloudsqlproxy labels: app: cloudsqlproxy @@ -16,15 +16,19 @@ spec: spec: serviceAccountName: kubeflow-pipelines-cloudsql-proxy containers: - - image: gcr.io/cloudsql-docker/gce-proxy:1.14 + - image: gcr.io/cloudsql-docker/gce-proxy:1.25.0 name: cloudsqlproxy - env: + env: - name: GCP_CLOUDSQL_INSTANCE_NAME valueFrom: configMapKeyRef: name: pipeline-install-config key: gcsCloudSqlInstanceName - command: ["/cloud_sql_proxy", "-dir=/cloudsql", "-instances=$(GCP_CLOUDSQL_INSTANCE_NAME)=tcp:0.0.0.0:3306", "term_timeout=10s"] + command: ["/cloud_sql_proxy", + "-dir=/cloudsql", + "-instances=$(GCP_CLOUDSQL_INSTANCE_NAME)=tcp:0.0.0.0:3306", + "-use_http_health_check", + "term_timeout=10s"] # set term_timeout if require graceful handling of shutdown # NOTE: proxy will stop accepting new connections; only wait on existing connections lifecycle: @@ -33,6 +37,47 @@ spec: # (optional) add a preStop hook so that termination is delayed # this is required if your server still require new connections (e.g., connection pools) command: ['sleep', '10'] + # Liveness probe configuration is adviced by Cloud SQL Proxy examples: + # https://github.com/GoogleCloudPlatform/cloudsql-proxy/tree/main/examples/k8s-health-check + # For details, see https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ + livenessProbe: + httpGet: + path: /liveness + port: '8090' + # Number of seconds after the container has started before the first probe is scheduled. Defaults to 0. + # Not necessary when the startup probe is in use. + initialDelaySeconds: 0 + # Frequency of the probe. + periodSeconds: 60 + # Number of seconds after which the probe times out. + timeoutSeconds: 30 + # Number of times the probe is allowed to fail before the transition + # from healthy to failure state. + # + # If periodSeconds = 60, 5 tries will result in five minutes of + # checks. The proxy starts to refresh a certificate five minutes + # before its expiration. If those five minutes lapse without a + # successful refresh, the liveness probe will fail and the pod will be + # restarted. + failureThreshold: 5 + readinessProbe: + httpGet: + path: /readiness + port: 8090 + initialDelaySeconds: 0 + periodSeconds: 10 + timeoutSeconds: 5 + # Number of times the probe must report success to transition from failure to healthy state. + # Defaults to 1 for readiness probe. + successThreshold: 1 + failureThreshold: 1 + startupProbe: + httpGet: + path: /startup + port: 8090 + periodSeconds: 1 + timeoutSeconds: 5 + failureThreshold: 20 ports: - name: mysql containerPort: 3306 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-sa.yaml index 6ccb0aec9..a4cc9c43d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/cloudsql-proxy-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-cloudsql-proxy +metadata: name: kubeflow-pipelines-cloudsql-proxy diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/kustomization.yaml index 0a7d5b67a..a336cb50f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - cloudsql-proxy-deployment.yaml - cloudsql-proxy-sa.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/mysql-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/mysql-service.yaml index 9135855af..f97dbc3a2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/mysql-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/cloudsql-proxy/mysql-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /mysql +metadata: name: mysql spec: ports: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/gcp-configurations-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/gcp-configurations-patch.yaml index b07639254..5e725b536 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/gcp-configurations-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/gcp-configurations-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /ml-pipeline +metadata: name: ml-pipeline spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/kustomization.yaml index e483a5a4f..e4e388c1a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: gcr.io/ml-pipeline/inverse-proxy-agent - newTag: 1.7.1 + newTag: 1.8.0-alpha.0 resources: - proxy-configmap.yaml - proxy-deployment.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-configmap.yaml index 47c724d94..c469f7acb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-configmap.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /inverse-proxy-config +metadata: name: inverse-proxy-config diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-deployment.yaml index 46333fca7..faf3e4730 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /proxy-agent +metadata: labels: app: proxy-agent name: proxy-agent diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-role.yaml index b7b4949ed..d6c03d5d0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /proxy-agent-runner +metadata: labels: app: proxy-agent-runner name: proxy-agent-runner @@ -10,4 +10,4 @@ rules: resources: - configmaps verbs: - - '*' + - '*' \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-rolebinding.yaml index e0e0f65e3..72f1fc0d6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /proxy-agent-runner +metadata: labels: app: proxy-agent-runner name: proxy-agent-runner diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-sa.yaml index 9266a0414..af8b0c3c2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/inverse-proxy/proxy-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /proxy-agent-runner +metadata: name: proxy-agent-runner diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/kustomization.yaml index 6730f947e..e96b88413 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: # Application controller is used to provide Google Cloud Console integration. - ../../third-party/application @@ -10,16 +11,20 @@ bases: - inverse-proxy - minio-gcs-gateway - cloudsql-proxy + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # !!! If you want to customize the namespace, # please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml namespace: kubeflow + patchesStrategicMerge: - gcp-configurations-patch.yaml + # Used by Kustomize configMapGenerator: - name: pipeline-install-config diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/kustomization.yaml index 81e6731c3..877ad8174 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/kustomization.yaml @@ -1,9 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - minio-gcs-gateway-deployment.yaml - minio-gcs-gateway-sa.yaml - minio-gcs-gateway-service.yaml + secretGenerator: - name: mlpipeline-minio-artifact env: minio-artifact-secret.env diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-deployment.yaml index 905255d99..bb85c95eb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /minio +metadata: name: minio labels: app: minio @@ -23,7 +23,7 @@ spec: - gateway - gcs - $(GCP_PROJECT_ID) - env: + env: - name: GCP_PROJECT_ID valueFrom: configMapKeyRef: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-sa.yaml index 4e7f356c3..2aa4f9376 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /kubeflow-pipelines-minio-gcs-gateway +metadata: name: kubeflow-pipelines-minio-gcs-gateway diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-service.yaml index 9b9c8dfe7..7dd181749 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/gcp/minio-gcs-gateway/minio-gcs-gateway-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /minio-service +metadata: name: minio-service spec: ports: @@ -8,4 +8,4 @@ spec: targetPort: 9000 protocol: TCP selector: - app: minio + app: minio \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/kustomization.yaml index 1cf7908f7..b0f866295 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/kustomization.yaml @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../platform-agnostic + patchesStrategicMerge: - workflow-controller-configmap-patch.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml index 75f530c95..87b8fda39 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-emissary/workflow-controller-configmap-patch.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /workflow-controller-configmap +metadata: name: workflow-controller-configmap data: # References: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/kustomization.yaml index 47d71413d..42dda7adc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/kustomization.yaml @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../platform-agnostic-multi-user + patchesStrategicMerge: - workflow-controller-configmap-patch.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml index 39a7488cd..7af58d852 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-emissary/workflow-controller-configmap-patch.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /workflow-controller-configmap +metadata: name: workflow-controller-configmap data: # References: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-legacy/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-legacy/kustomization.yaml index 1725660ec..6800d9e01 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-legacy/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-legacy/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: - ../../base/installs/multi-user - ../../base/metadata/overlays/db @@ -10,11 +11,13 @@ bases: - ../../third-party/minio/base - ../../third-party/minio/options/istio - ../../third-party/metacontroller/base + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # !!! If you want to customize the namespace, # please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml namespace: kubeflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/kustomization.yaml index 47d71413d..42dda7adc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/kustomization.yaml @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../platform-agnostic-multi-user + patchesStrategicMerge: - workflow-controller-configmap-patch.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml index cebfc871e..896501300 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user-pns/workflow-controller-configmap-patch.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /workflow-controller-configmap +metadata: name: workflow-controller-configmap data: # References: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user/kustomization.yaml index 721dcbc08..1ea99e57e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-multi-user/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: - ../../base/installs/multi-user - ../../base/metadata/base @@ -10,11 +11,13 @@ bases: - ../../third-party/minio/base - ../../third-party/minio/options/istio - ../../third-party/metacontroller/base + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # !!! If you want to customize the namespace, # please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml namespace: kubeflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/kustomization.yaml index 1cf7908f7..b0f866295 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/kustomization.yaml @@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../platform-agnostic + patchesStrategicMerge: - workflow-controller-configmap-patch.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml index d0a60c2f6..0a2ee2fab 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic-pns/workflow-controller-configmap-patch.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /workflow-controller-configmap +metadata: name: workflow-controller-configmap data: # References: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic/kustomization.yaml index 342bee838..cb840c968 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/env/platform-agnostic/kustomization.yaml @@ -1,16 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: - ../../base/installs/generic - ../../base/metadata/base - ../../third-party/argo/installs/namespace - ../../third-party/minio/base - ../../third-party/mysql/base + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # !!! If you want to customize the namespace, # please also update base/cache-deployer/cluster-scoped/cache-deployer-clusterrolebinding.yaml namespace: kubeflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/cluster-scoped-resources/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/cluster-scoped-resources/kustomization.yaml index 9cbbf1427..83c54aa99 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/cluster-scoped-resources/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/cluster-scoped-resources/kustomization.yaml @@ -1,8 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + # !!! If you want to customize the namespace, # please also update sample/kustomization.yaml's namespace field to the same value namespace: kubeflow + bases: # Or github.com/kubeflow/pipelines/manifests/kustomize/cluster-scoped-resources?ref=1.0.0 - ../../cluster-scoped-resources diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/kustomization.yaml index 7bf60ac05..3af7efd42 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/sample/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: # Or github.com/kubeflow/pipelines/manifests/kustomize/env/gcp?ref=1.0.0 - ../env/gcp @@ -9,20 +10,24 @@ bases: # If you have your own Prometheus server up already or you don't want a Prometheus server for monitoring, you can comment the following line out. # - ../third_party/prometheus # - ../third_party/grafana + # Identifier for application manager to apply ownerReference. # The ownerReference ensures the resources get garbage collected # when application is deleted. commonLabels: application-crd-id: kubeflow-pipelines + # Used by Kustomize configMapGenerator: - name: pipeline-install-config env: params.env behavior: merge + secretGenerator: - name: mysql-secret env: params-db-secret.env behavior: merge + # !!! If you want to customize the namespace, # please also update sample/cluster-scoped-resources/kustomization.yaml's namespace field to the same value namespace: kubeflow diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-deployment.yaml index 59c92dee9..8cffbb44f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /controller-manager +metadata: name: controller-manager labels: control-plane: controller-manager @@ -18,12 +18,12 @@ spec: spec: containers: - command: - - /bin/sh - - -c - # See https://github.com/kubeflow/gcp-blueprints/issues/184. - - | - echo "logs are hidden because volume is too excessive" && - /root/manager 2> /dev/null + - /bin/sh + - -c + # See https://github.com/kubeflow/gcp-blueprints/issues/184. + - | + echo "logs are hidden because volume is too excessive" && + /root/manager 2> /dev/null # A customized image with https://github.com/kubernetes-sigs/application/pull/127 image: gcr.io/ml-pipeline/application-crd-controller:1.0-beta-non-cluster-role imagePullPolicy: IfNotPresent diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-role.yaml index 6ee6d702d..ac0613508 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /application-manager-role +metadata: name: application-manager-role rules: - apiGroups: @@ -18,4 +18,4 @@ rules: resources: - '*' verbs: - - '*' + - '*' \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-rolebinding.yaml index 11021b6c2..24b383a18 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /application-manager-rolebinding +metadata: name: application-manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-sa.yaml index 22f46e0f7..bd1303915 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /application +metadata: name: application diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-service.yaml index b1505394e..e4b6086ba 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/application-controller-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /controller-manager-service +metadata: name: controller-manager-service labels: control-plane: controller-manager @@ -10,4 +10,4 @@ spec: control-plane: controller-manager controller-tools.k8s.io: "1.0" ports: - - port: 443 + - port: 443 \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/cluster-scoped/application-crd.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/cluster-scoped/application-crd.yaml index 9b1c850ce..e17455d52 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/cluster-scoped/application-crd.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/cluster-scoped/application-crd.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: # kpt-merge: /applications.app.k8s.io +metadata: labels: controller-tools.k8s.io: "1.0" name: applications.app.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/kustomization.yaml index c02d8ec76..c35e3eebc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/application/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - application-controller-deployment.yaml - application-controller-role.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/kustomization.yaml index aebad6170..81c3b9316 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/kustomization.yaml @@ -1,10 +1,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: - ../upstream/manifests/base/workflow-controller + patchesStrategicMerge: - workflow-controller-deployment-patch.yaml - workflow-controller-configmap-patch.yaml + # Allow Kustomize vars to replace fields defined in params.yaml. # The vars can be defined anywhere. configurations: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-configmap-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-configmap-patch.yaml index 120ad5869..67bb79c0a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-configmap-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-configmap-patch.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: # kpt-merge: /workflow-controller-configmap +metadata: name: workflow-controller-configmap data: # References: @@ -10,6 +10,7 @@ data: # emissary executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654. containerRuntimeExecutor: docker + # In artifactRepository.s3.endpoint, $(kfp-namespace) is needed, because in multi-user mode, pipelines may run in other namespaces. artifactRepository: | archiveLogs: true diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-deployment-patch.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-deployment-patch.yaml index d4ee0921b..91a9317f4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-deployment-patch.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/base/workflow-controller-deployment-patch.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /workflow-controller +metadata: name: workflow-controller spec: template: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/cluster/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/cluster/kustomization.yaml index bdbb8ace1..3bb1a466d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/cluster/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/cluster/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + bases: # Note, we do not explicitly separate cluster-scoped resources for cluster installation, # because people who deploy cluster-scoped resources should be the same as who deploys @@ -7,10 +8,11 @@ bases: - ../../upstream/manifests/base/crds - ../../upstream/manifests/cluster-install/workflow-controller-rbac - ../../base + patchesJson6902: - target: group: rbac.authorization.k8s.io version: v1 kind: ClusterRoleBinding name: argo-binding - path: workflow-controller-clusterrolebinding-patch.json + path: workflow-controller-clusterrolebinding-patch.json \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/namespace/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/namespace/kustomization.yaml index 7dbbc0036..1a861c499 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/namespace/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/installs/namespace/kustomization.yaml @@ -1,12 +1,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + # This kustomization.yaml is built mirroring ../../upstream/manifests/namespace-install/kustomization.yaml. # The differences: # * this does not include argo server. # * this separates cluster-scoped resources to its own folder. + bases: - ../../base - ../../upstream/manifests/namespace-install/workflow-controller-rbac + patchesJson6902: - target: version: v1 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-deployment.yaml index d826b83e8..be9b77b0f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: kubeflow/grafana +metadata: name: grafana namespace: kubeflow labels: @@ -57,4 +57,4 @@ spec: securityContext: fsGroup: 472 runAsUser: 472 - # TODO(jingzhang36): consider adding persistent volume if you would like the created dashboards to persist. +# TODO(jingzhang36): consider adding persistent volume if you would like the created dashboards to persist. \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-role.yaml index c3a393958..e06c9e9e6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /grafana +metadata: labels: app: grafana name: grafana diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-rolebinding.yaml index 088abb09a..c9f8b6294 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /grafana +metadata: labels: app: grafana name: grafana diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-sa.yaml index 62f2d59b0..1ec8b08b8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /grafana +metadata: name: grafana diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-service.yaml index f1d344830..ced9c388a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/grafana-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /grafana +metadata: labels: app: grafana name: grafana diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/kustomization.yaml index c6afe8deb..fd1cf0261 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/grafana/kustomization.yaml @@ -7,5 +7,5 @@ resources: - grafana-sa.yaml - grafana-rolebinding.yaml images: -- name: grafana/grafana - newTag: 5.3.4 + - name: grafana/grafana + newTag: 5.3.4 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/cluster-role-binding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/cluster-role-binding.yaml index a8579cf8e..dc9c73241 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/cluster-role-binding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/cluster-role-binding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: # kpt-merge: /meta-controller-cluster-role-binding +metadata: name: meta-controller-cluster-role-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/crd.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/crd.yaml index e49443985..0ae8700d7 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/crd.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/crd.yaml @@ -1,6 +1,7 @@ +--- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: # kpt-merge: /compositecontrollers.metacontroller.k8s.io +metadata: name: compositecontrollers.metacontroller.k8s.io spec: group: metacontroller.k8s.io @@ -16,7 +17,7 @@ spec: --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: # kpt-merge: /controllerrevisions.metacontroller.k8s.io +metadata: name: controllerrevisions.metacontroller.k8s.io spec: group: metacontroller.k8s.io @@ -29,7 +30,7 @@ spec: --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: # kpt-merge: /decoratorcontrollers.metacontroller.k8s.io +metadata: name: decoratorcontrollers.metacontroller.k8s.io spec: group: metacontroller.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/kustomization.yaml index fb7f0e8cb..ef53d9b55 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/kustomization.yaml @@ -8,7 +8,3 @@ resources: - stateful-set.yaml commonLabels: kustomize.component: metacontroller -images: -- name: metacontroller/metacontroller - newName: metacontroller/metacontroller - newTag: v0.3.0 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/service-account.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/service-account.yaml index 6006dd3df..85c48de17 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/service-account.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/service-account.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /meta-controller-service +metadata: name: meta-controller-service diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/stateful-set.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/stateful-set.yaml index 21cf6a447..b0ca0076e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/stateful-set.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/stateful-set.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: StatefulSet -metadata: # kpt-merge: /metacontroller +metadata: labels: app: metacontroller name: metacontroller @@ -18,26 +18,28 @@ spec: sidecar.istio.io/inject: "false" spec: containers: - - command: - - /usr/bin/metacontroller - - --logtostderr - - -v=4 - - --discovery-interval=20s - image: metacontroller/metacontroller:v0.3.0 - imagePullPolicy: Always - name: metacontroller - ports: - - containerPort: 2345 - resources: - limits: - cpu: "4" - memory: 4Gi - requests: - cpu: 500m - memory: 1Gi - securityContext: - allowPrivilegeEscalation: true - privileged: true + - resources: + limits: + cpu: '1' + memory: 1Gi + requests: + cpu: 100m + memory: 256Mi + command: + - /usr/bin/metacontroller + - --zap-log-level=4 + - '--discovery-interval=3600s' # less insane than 10 seconds + securityContext: + capabilities: + drop: + - ALL + readOnlyRootFilesystem: true + runAsNonRoot: true + runAsUser: 1000 + privileged: false + allowPrivilegeEscalation: false + name: metacontroller + image: 'docker.io/metacontrollerio/metacontroller:v2.0.4' serviceAccountName: meta-controller-service # Workaround for https://github.com/kubernetes-sigs/kustomize/issues/677 volumeClaimTemplates: [] diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/kustomization.yaml index 8997de345..e3b41d4cd 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - minio-deployment.yaml - minio-pvc.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-deployment.yaml index adc945cbd..a1bd96307 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /minio +metadata: name: minio labels: app: minio diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-pvc.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-pvc.yaml index 64a6a484d..ecfa32bbe 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-pvc.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-pvc.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: PersistentVolumeClaim -metadata: # kpt-merge: /minio-pvc +metadata: name: minio-pvc spec: accessModes: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-service.yaml index 656d8ae70..3ab420430 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/minio-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /minio-service +metadata: name: minio-service spec: ports: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/mlpipeline-minio-artifact-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/mlpipeline-minio-artifact-secret.yaml index 7d4544fa9..ac298d9b3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/mlpipeline-minio-artifact-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/base/mlpipeline-minio-artifact-secret.yaml @@ -1,6 +1,6 @@ kind: Secret apiVersion: v1 -metadata: # kpt-merge: /mlpipeline-minio-artifact +metadata: name: mlpipeline-minio-artifact stringData: accesskey: minio diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/istio-authorization-policy.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/istio-authorization-policy.yaml index 10af61826..7247cd34f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/istio-authorization-policy.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/istio-authorization-policy.yaml @@ -1,6 +1,6 @@ apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: /minio-service +metadata: name: minio-service spec: action: ALLOW @@ -21,7 +21,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: # kpt-merge: /ml-pipeline-minio +metadata: name: ml-pipeline-minio spec: host: minio-service.kubeflow.svc.cluster.local diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/kustomization.yaml index dc764d773..611e399e5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/minio/options/istio/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - istio-authorization-policy.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/kustomization.yaml index eae62ccc8..df8929c19 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - mysql-deployment.yaml - mysql-pv-claim.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-deployment.yaml index 6d4ef6168..c7174d44b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /mysql +metadata: name: mysql labels: app: mysql @@ -35,9 +35,9 @@ spec: - mountPath: /var/lib/mysql name: mysql-persistent-storage resources: - requests: - cpu: 100m - memory: 800Mi + requests: + cpu: 100m + memory: 800Mi volumes: - name: mysql-persistent-storage persistentVolumeClaim: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-pv-claim.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-pv-claim.yaml index eac8bb57f..108dc24ef 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-pv-claim.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-pv-claim.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: PersistentVolumeClaim -metadata: # kpt-merge: /mysql-pv-claim +metadata: name: mysql-pv-claim spec: accessModes: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-service.yaml index 61afaad35..d52482770 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /mysql +metadata: name: mysql spec: ports: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-serviceaccount.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-serviceaccount.yaml index 152242e19..f9a2ab7d4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-serviceaccount.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/base/mysql-serviceaccount.yaml @@ -1,4 +1,5 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /mysql +metadata: name: mysql + diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/istio-authorization-policy.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/istio-authorization-policy.yaml index 8b0e2eb06..a8dcb205c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/istio-authorization-policy.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/istio-authorization-policy.yaml @@ -1,6 +1,6 @@ apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: # kpt-merge: kubeflow/mysql +metadata: name: mysql namespace: kubeflow spec: @@ -18,10 +18,12 @@ spec: - cluster.local/ns/kubeflow/sa/ml-pipeline-viewer-crd-service-account - cluster.local/ns/kubeflow/sa/kubeflow-pipelines-cache - cluster.local/ns/kubeflow/sa/metadata-grpc-server + --- + apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: # kpt-merge: /ml-pipeline-mysql +metadata: name: ml-pipeline-mysql spec: host: mysql.kubeflow.svc.cluster.local diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/kustomization.yaml index dc764d773..611e399e5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/mysql/options/istio/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - istio-authorization-policy.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/kustomization.yaml index 7fab6008e..9b2d54ef6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/kustomization.yaml @@ -8,4 +8,4 @@ resources: - prometheus-service.yaml - prometheus-deployment.yaml images: -- name: prom/prometheus + - name: prom/prometheus diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-configmap.yaml index 9a9da55a3..6bb19ccdf 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-configmap.yaml @@ -27,5 +27,5 @@ data: static_configs: - targets: ['ml-pipeline:8888'] kind: ConfigMap -metadata: # kpt-merge: /prometheus-configmap - name: prometheus-configmap +metadata: + name: prometheus-configmap \ No newline at end of file diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-deployment.yaml index aa09af8ce..ebd4f8aeb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: # kpt-merge: /prometheus +metadata: name: prometheus labels: app: prometheus @@ -18,15 +18,17 @@ spec: - name: prometheus image: prom/prometheus volumeMounts: - - name: config-volume - mountPath: /etc/prometheus/prometheus.yml - subPath: prometheus.yml - args: ["--storage.tsdb.retention.time=7d", # Adjust retention policy if necessary - "--storage.tsdb.retention.size=1GB", "--config.file=/etc/prometheus/prometheus.yml"] + - name: config-volume + mountPath: /etc/prometheus/prometheus.yml + subPath: prometheus.yml + args: ["--storage.tsdb.retention.time=7d", # Adjust retention policy if necessary + "--storage.tsdb.retention.size=1GB", + "--config.file=/etc/prometheus/prometheus.yml", + ] ports: - containerPort: 9090 volumes: - - name: config-volume - configMap: - name: prometheus-configmap + - name: config-volume + configMap: + name: prometheus-configmap serviceAccountName: prometheus diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-role.yaml index 9bc4d6dbe..4cb03fc19 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: # kpt-merge: /prometheus +metadata: labels: app: prometheus name: prometheus diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-rolebinding.yaml index ad2133bdf..12a56ee13 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: # kpt-merge: /prometheus +metadata: labels: app: prometheus name: prometheus diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-sa.yaml index 1ff59c55b..f3fb283ca 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: # kpt-merge: /prometheus +metadata: name: prometheus diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-service.yaml index c9e522593..7071bb7a9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/prometheus/prometheus-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: # kpt-merge: /prometheus +metadata: labels: app: prometheus name: prometheus