From 9c9a023f2db4949d28c49678852b2998ecb3ca9f Mon Sep 17 00:00:00 2001 From: James Liu <37026441+zijianjoy@users.noreply.github.com> Date: Mon, 1 Nov 2021 20:53:59 -0700 Subject: [PATCH] test(kfp): upgrade to 1.7.1 (#968) * test(kfp): upgrade to 1.7.1 * make hydrate-kfp-manifests --- acm-repos/kfp-standalone-1/kfp-all.yaml | 512 +++++++++--------- test-infra/kfp/Makefile | 2 +- test-infra/kfp/README.md | 8 + .../kustomize/upstream/Kptfile | 13 +- .../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 | 11 +- .../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 | 2 +- .../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 | 20 +- .../cluster-role-binding.yaml | 2 +- .../viewer-controller/cluster-role.yaml | 2 +- .../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 | 12 +- .../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 | 4 +- .../pipeline/cluster-scoped/viewer-crd.yaml | 2 +- .../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 | 30 +- .../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 | 4 +- ...-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 | 9 +- .../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 | 8 +- .../kustomization.yaml | 3 - .../kustomization.yaml | 1 - .../workflow-controller-configmap-patch.yaml | 8 +- .../kustomization.yaml | 3 - .../platform-agnostic-pns/kustomization.yaml | 1 - .../workflow-controller-configmap-patch.yaml | 8 +- .../env/platform-agnostic/kustomization.yaml | 3 - .../kustomize/upstream/hack/test.sh | 5 +- .../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 - .../upstream/third-party/argo/.krmignore | 1 + .../upstream/third-party/argo/Kptfile | 6 + .../upstream/third-party/argo/README.md | 6 +- .../third-party/argo/base/kustomization.yaml | 3 - .../workflow-controller-configmap-patch.yaml | 9 +- .../workflow-controller-deployment-patch.yaml | 6 +- .../argo/installs/cluster/kustomization.yaml | 4 +- .../installs/namespace/kustomization.yaml | 3 - .../argo/upstream/manifests/Kptfile | 13 +- .../argo-server/argo-server-deployment.yaml | 6 +- .../base/argo-server/argo-server-sa.yaml | 2 +- .../base/argo-server/argo-server-service.yaml | 2 +- .../base/argo-server/kustomization.yaml | 1 - .../argoproj.io_clusterworkflowtemplates.yaml | 2 +- .../crds/full/argoproj.io_cronworkflows.yaml | 2 +- .../argoproj.io_workfloweventbindings.yaml | 2 +- .../base/crds/full/argoproj.io_workflows.yaml | 194 ++++++- .../full/argoproj.io_workflowtemplates.yaml | 2 +- .../base/crds/full/kustomization.yaml | 1 - .../manifests/base/crds/kustomization.yaml | 1 - .../argoproj.io_clusterworkflowtemplates.yaml | 2 +- .../minimal/argoproj.io_cronworkflows.yaml | 2 +- .../argoproj.io_workfloweventbindings.yaml | 2 +- .../crds/minimal/argoproj.io_workflows.yaml | 2 +- .../argoproj.io_workflowtemplates.yaml | 2 +- .../base/crds/minimal/kustomization.yaml | 1 - .../manifests/base/kustomization.yaml | 1 - .../workflow-controller/kustomization.yaml | 1 - .../workflow-controller-configmap.yaml | 2 +- .../workflow-controller-deployment.yaml | 2 +- .../workflow-controller-metrics-service.yaml | 2 +- .../workflow-controller-sa.yaml | 2 +- .../argo-server-clusterole.yaml | 2 +- .../argo-server-clusterolebinding.yaml | 2 +- .../argo-server-rbac/kustomization.yaml | 1 - .../cluster-install/kustomization.yaml | 1 - .../kustomization.yaml | 1 - .../workflow-aggregate-roles.yaml | 8 +- .../workflow-controller-clusterrole.yaml | 12 +- ...orkflow-controller-clusterrolebinding.yaml | 2 +- .../workflow-controller-role.yaml | 3 +- .../workflow-controller-rolebinding.yaml | 2 +- .../argo-server-rbac/argo-server-role.yaml | 2 +- .../argo-server-rolebinding.yaml | 2 +- .../argo-server-rbac/kustomization.yaml | 1 - .../namespace-install/kustomization.yaml | 6 +- .../overlays/argo-server-deployment.json | 7 - .../overlays/argo-server-deployment.yaml | 3 + .../workflow-controller-deployment.json | 7 - .../workflow-controller-deployment.yaml | 3 + .../kustomization.yaml | 1 - .../workflow-controller-role.yaml | 2 +- .../workflow-controller-rolebinding.yaml | 3 +- .../base/argo-server-sso-secret.yaml | 2 +- .../base/artifact-repositories-configmap.yaml | 4 +- .../base/cluster-workflow-template-rbac.yaml | 9 +- .../base/kubelet-executor-clusterrole.yaml | 4 +- ...t-executor-default-clusterrolebinding.yaml | 2 +- .../quick-start/base/kustomization.yaml | 2 - .../quick-start/base/minio/kustomization.yaml | 3 +- .../quick-start/base/minio/minio-deploy.yaml | 4 +- .../quick-start/base/minio/minio-pod.yaml | 4 +- .../quick-start/base/minio/minio-service.yaml | 3 +- .../base/minio/my-minio-cred-secret.yaml | 2 +- .../base/overlays/argo-server-deployment.yaml | 4 +- .../workflow-controller-configmap.yaml | 2 +- .../base/prometheus/kustomization.yaml | 1 - .../prometheus/prometheus-config-cluster.yaml | 2 +- .../prometheus/prometheus-deployment.yaml | 8 +- .../base/prometheus/prometheus-service.yaml | 2 +- ...argo-workflows-webhook-clients-secret.yaml | 6 +- .../base/webhooks/github.com-rolebinding.yaml | 4 +- .../base/webhooks/github.com-sa.yaml | 2 +- .../base/webhooks/kustomization.yaml | 1 - .../submit-workflow-template-role.yaml | 4 +- .../base/workflow-default-rolebinding.yaml | 2 +- .../quick-start/base/workflow-role.yaml | 4 +- .../quick-start/minimal/kustomization.yaml | 1 - .../mysql/argo-mysql-config-secret.yaml | 2 +- .../quick-start/mysql/kustomization.yaml | 4 +- .../quick-start/mysql/mysql-deployment.yaml | 4 +- .../quick-start/mysql/mysql-service.yaml | 4 +- .../workflow-controller-configmap.yaml | 4 +- .../postgres/argo-postgres-config-secret.yaml | 2 +- .../quick-start/postgres/kustomization.yaml | 4 +- .../workflow-controller-configmap.yaml | 4 +- .../postgres/postgres-deployment.yaml | 4 +- .../postgres/postgres-service.yaml | 4 +- .../quick-start/sso/dex/dev-svc.yaml | 2 +- .../manifests/quick-start/sso/dex/dex-cm.yaml | 4 +- .../quick-start/sso/dex/dex-deploy.yaml | 4 +- .../manifests/quick-start/sso/dex/dex-rb.yaml | 2 +- .../quick-start/sso/dex/dex-role.yaml | 2 +- .../manifests/quick-start/sso/dex/dex-sa.yaml | 2 +- .../quick-start/sso/dex/kustomization.yaml | 2 - .../quick-start/sso/kustomization.yaml | 4 +- .../sso/overlays/argo-server-sa.yaml | 2 +- .../workflow-controller-configmap.yaml | 2 +- .../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/service-account.yaml | 2 +- .../metacontroller/base/stateful-set.yaml | 2 +- .../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 +- 281 files changed, 969 insertions(+), 900 deletions(-) create mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/.krmignore create mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/Kptfile delete mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.json create mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.yaml delete mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.json create mode 100644 test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.yaml diff --git a/acm-repos/kfp-standalone-1/kfp-all.yaml b/acm-repos/kfp-standalone-1/kfp-all.yaml index ecd43f40843..ccdbc9f842a 100644 --- a/acm-repos/kfp-standalone-1/kfp-all.yaml +++ b/acm-repos/kfp-standalone-1/kfp-all.yaml @@ -514,17 +514,17 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: + app: cache-server application-crd-id: kubeflow-pipelines - name: kubeflow-pipelines-cache-deployer-sa + name: kubeflow-pipelines-cache namespace: kubeflow --- apiVersion: v1 kind: ServiceAccount metadata: labels: - app: cache-server application-crd-id: kubeflow-pipelines - name: kubeflow-pipelines-cache + name: kubeflow-pipelines-cache-deployer-sa namespace: kubeflow --- apiVersion: v1 @@ -564,7 +564,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-persistenceagent + name: ml-pipeline namespace: kubeflow --- apiVersion: v1 @@ -572,7 +572,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-scheduledworkflow + name: ml-pipeline-persistenceagent namespace: kubeflow --- apiVersion: v1 @@ -580,7 +580,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-ui + name: ml-pipeline-scheduledworkflow namespace: kubeflow --- apiVersion: v1 @@ -588,7 +588,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-viewer-crd-service-account + name: ml-pipeline-ui namespace: kubeflow --- apiVersion: v1 @@ -596,7 +596,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-visualizationserver + name: ml-pipeline-viewer-crd-service-account namespace: kubeflow --- apiVersion: v1 @@ -604,7 +604,7 @@ kind: ServiceAccount metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline + name: ml-pipeline-visualizationserver namespace: kubeflow --- apiVersion: v1 @@ -858,6 +858,60 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role +metadata: + labels: + app: ml-pipeline + application-crd-id: kubeflow-pipelines + name: ml-pipeline + namespace: kubeflow +rules: +- apiGroups: + - "" + resources: + - pods + - pods/log + verbs: + - get + - list + - delete +- apiGroups: + - argoproj.io + resources: + - workflows + verbs: + - create + - get + - list + - watch + - update + - patch + - delete +- apiGroups: + - kubeflow.org + resources: + - scheduledworkflows + verbs: + - create + - get + - list + - update + - patch + - delete +- apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create +- apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role metadata: labels: application-crd-id: kubeflow-pipelines @@ -1005,60 +1059,6 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: - labels: - app: ml-pipeline - application-crd-id: kubeflow-pipelines - name: ml-pipeline - namespace: kubeflow -rules: -- apiGroups: - - "" - resources: - - pods - - pods/log - verbs: - - get - - list - - delete -- apiGroups: - - argoproj.io - resources: - - workflows - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - kubeflow.org - resources: - - scheduledworkflows - verbs: - - create - - get - - list - - update - - patch - - delete -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role metadata: labels: application-crd-id: kubeflow-pipelines @@ -1280,16 +1280,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: + app: ml-pipeline application-crd-id: kubeflow-pipelines - name: ml-pipeline-persistenceagent-binding + name: ml-pipeline namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ml-pipeline-persistenceagent-role + name: ml-pipeline subjects: - kind: ServiceAccount - name: ml-pipeline-persistenceagent + name: ml-pipeline namespace: kubeflow --- apiVersion: rbac.authorization.k8s.io/v1 @@ -1297,65 +1298,64 @@ kind: RoleBinding metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline-scheduledworkflow-binding + name: ml-pipeline-persistenceagent-binding namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ml-pipeline-scheduledworkflow-role + name: ml-pipeline-persistenceagent-role subjects: - kind: ServiceAccount - name: ml-pipeline-scheduledworkflow + name: ml-pipeline-persistenceagent namespace: kubeflow --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app: ml-pipeline-ui application-crd-id: kubeflow-pipelines - name: ml-pipeline-ui + name: ml-pipeline-scheduledworkflow-binding namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ml-pipeline-ui + name: ml-pipeline-scheduledworkflow-role subjects: - kind: ServiceAccount - name: ml-pipeline-ui + name: ml-pipeline-scheduledworkflow namespace: kubeflow --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: + app: ml-pipeline-ui application-crd-id: kubeflow-pipelines - name: ml-pipeline-viewer-crd-binding + name: ml-pipeline-ui namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ml-pipeline-viewer-controller-role + name: ml-pipeline-ui subjects: - kind: ServiceAccount - name: ml-pipeline-viewer-crd-service-account + name: ml-pipeline-ui namespace: kubeflow --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app: ml-pipeline application-crd-id: kubeflow-pipelines - name: ml-pipeline + name: ml-pipeline-viewer-crd-binding namespace: kubeflow roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: ml-pipeline + name: ml-pipeline-viewer-controller-role subjects: - kind: ServiceAccount - name: ml-pipeline + name: ml-pipeline-viewer-crd-service-account namespace: kubeflow --- apiVersion: rbac.authorization.k8s.io/v1 @@ -1453,9 +1453,9 @@ metadata: --- apiVersion: v1 data: - ConMaxLifeTimeSec: "120" + ConMaxLifeTime: 120s appName: kfp-standalone-1 - appVersion: 1.7.0 + appVersion: 1.7.1 autoUpdatePipelineDefaultVersion: "true" bucketName: mlpipeline cacheDb: cachedb @@ -1477,7 +1477,6 @@ data: namespace: `kubectl rollout restart deployment -n `. kind: ConfigMap metadata: - annotations: {} labels: application-crd-id: kubeflow-pipelines name: pipeline-install-config @@ -1544,7 +1543,6 @@ data: username: cm9vdA== kind: Secret metadata: - annotations: {} labels: application-crd-id: kubeflow-pipelines name: mysql-secret @@ -1641,35 +1639,39 @@ apiVersion: v1 kind: Service metadata: labels: - app: ml-pipeline-ui application-crd-id: kubeflow-pipelines - name: ml-pipeline-ui + name: ml-pipeline namespace: kubeflow spec: ports: - name: http - port: 80 + port: 8888 protocol: TCP - targetPort: 3000 + targetPort: 8888 + - name: grpc + port: 8887 + protocol: TCP + targetPort: 8887 selector: - app: ml-pipeline-ui + app: ml-pipeline application-crd-id: kubeflow-pipelines --- apiVersion: v1 kind: Service metadata: labels: + app: ml-pipeline-ui application-crd-id: kubeflow-pipelines - name: ml-pipeline-visualizationserver + name: ml-pipeline-ui namespace: kubeflow spec: ports: - name: http - port: 8888 + port: 80 protocol: TCP - targetPort: 8888 + targetPort: 3000 selector: - app: ml-pipeline-visualizationserver + app: ml-pipeline-ui application-crd-id: kubeflow-pipelines --- apiVersion: v1 @@ -1677,7 +1679,7 @@ kind: Service metadata: labels: application-crd-id: kubeflow-pipelines - name: ml-pipeline + name: ml-pipeline-visualizationserver namespace: kubeflow spec: ports: @@ -1685,12 +1687,8 @@ spec: port: 8888 protocol: TCP targetPort: 8888 - - name: grpc - port: 8887 - protocol: TCP - targetPort: 8887 selector: - app: ml-pipeline + app: ml-pipeline-visualizationserver application-crd-id: kubeflow-pipelines --- apiVersion: v1 @@ -1727,6 +1725,34 @@ spec: app: workflow-controller application-crd-id: kubeflow-pipelines --- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + application-crd-id: kubeflow-pipelines + name: minio-pvc + namespace: kubeflow +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Gi +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + application-crd-id: kubeflow-pipelines + name: mysql-pv-claim + namespace: kubeflow +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Gi +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -1755,7 +1781,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/cache-deployer:1.7.0 + image: gcr.io/ml-pipeline/cache-deployer:1.7.1 imagePullPolicy: Always name: main restartPolicy: Always @@ -1832,7 +1858,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/cache-server:1.7.0 + image: gcr.io/ml-pipeline/cache-server:1.7.1 imagePullPolicy: Always name: server ports: @@ -1917,7 +1943,7 @@ spec: component: metadata-envoy spec: containers: - - image: gcr.io/ml-pipeline/metadata-envoy:1.7.0 + - image: gcr.io/ml-pipeline/metadata-envoy:1.7.1 name: container ports: - containerPort: 9090 @@ -2027,7 +2053,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/metadata-writer:1.7.0 + image: gcr.io/ml-pipeline/metadata-writer:1.7.1 name: main serviceAccountName: kubeflow-pipelines-metadata-writer --- @@ -2086,6 +2112,123 @@ spec: --- apiVersion: apps/v1 kind: Deployment +metadata: + labels: + app: ml-pipeline + application-crd-id: kubeflow-pipelines + name: ml-pipeline + namespace: kubeflow +spec: + selector: + matchLabels: + app: ml-pipeline + application-crd-id: kubeflow-pipelines + template: + metadata: + annotations: + cluster-autoscaler.kubernetes.io/safe-to-evict: "true" + labels: + app: ml-pipeline + application-crd-id: kubeflow-pipelines + spec: + containers: + - env: + - name: AUTO_UPDATE_PIPELINE_DEFAULT_VERSION + valueFrom: + configMapKeyRef: + key: autoUpdatePipelineDefaultVersion + name: pipeline-install-config + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: OBJECTSTORECONFIG_SECURE + value: "false" + - name: OBJECTSTORECONFIG_BUCKETNAME + valueFrom: + configMapKeyRef: + key: bucketName + name: pipeline-install-config + - name: DBCONFIG_USER + valueFrom: + secretKeyRef: + key: username + name: mysql-secret + - name: DBCONFIG_PASSWORD + valueFrom: + secretKeyRef: + key: password + name: mysql-secret + - name: DBCONFIG_DBNAME + valueFrom: + configMapKeyRef: + key: pipelineDb + name: pipeline-install-config + - name: DBCONFIG_HOST + valueFrom: + configMapKeyRef: + key: dbHost + name: pipeline-install-config + - name: DBCONFIG_PORT + valueFrom: + configMapKeyRef: + key: dbPort + name: pipeline-install-config + - name: DBCONFIG_CONMAXLIFETIME + valueFrom: + configMapKeyRef: + key: ConMaxLifeTime + name: pipeline-install-config + - name: OBJECTSTORECONFIG_ACCESSKEY + valueFrom: + secretKeyRef: + key: accesskey + name: mlpipeline-minio-artifact + - name: OBJECTSTORECONFIG_SECRETACCESSKEY + valueFrom: + secretKeyRef: + key: secretkey + name: mlpipeline-minio-artifact + image: gcr.io/ml-pipeline/api-server:1.7.1 + imagePullPolicy: IfNotPresent + livenessProbe: + exec: + command: + - wget + - -q + - -S + - -O + - '-' + - http://localhost:8888/apis/v1beta1/healthz + initialDelaySeconds: 3 + periodSeconds: 5 + timeoutSeconds: 2 + name: ml-pipeline-api-server + ports: + - containerPort: 8888 + name: http + - containerPort: 8887 + name: grpc + readinessProbe: + exec: + command: + - wget + - -q + - -S + - -O + - '-' + - http://localhost:8888/apis/v1beta1/healthz + initialDelaySeconds: 3 + periodSeconds: 5 + timeoutSeconds: 2 + resources: + requests: + cpu: 250m + memory: 500Mi + serviceAccountName: ml-pipeline +--- +apiVersion: apps/v1 +kind: Deployment metadata: labels: app: ml-pipeline-persistenceagent @@ -2115,7 +2258,7 @@ spec: value: "86400" - name: NUM_WORKERS value: "2" - image: gcr.io/ml-pipeline/persistenceagent:1.7.0 + image: gcr.io/ml-pipeline/persistenceagent:1.7.1 imagePullPolicy: IfNotPresent name: ml-pipeline-persistenceagent resources: @@ -2156,7 +2299,7 @@ spec: configMapKeyRef: key: cronScheduleTimezone name: pipeline-install-config - image: gcr.io/ml-pipeline/scheduledworkflow:1.7.0 + image: gcr.io/ml-pipeline/scheduledworkflow:1.7.1 imagePullPolicy: IfNotPresent name: ml-pipeline-scheduledworkflow serviceAccountName: ml-pipeline-scheduledworkflow @@ -2202,7 +2345,7 @@ spec: name: mlpipeline-minio-artifact - name: ALLOW_CUSTOM_VISUALIZATIONS value: "true" - image: gcr.io/ml-pipeline/frontend:1.7.0 + image: gcr.io/ml-pipeline/frontend:1.7.1 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2274,7 +2417,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/viewer-crd-controller:1.7.0 + image: gcr.io/ml-pipeline/viewer-crd-controller:1.7.1 imagePullPolicy: Always name: ml-pipeline-viewer-crd serviceAccountName: ml-pipeline-viewer-crd-service-account @@ -2301,7 +2444,7 @@ spec: application-crd-id: kubeflow-pipelines spec: containers: - - image: gcr.io/ml-pipeline/visualization-server:1.7.0 + - image: gcr.io/ml-pipeline/visualization-server:1.7.1 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -2339,123 +2482,6 @@ spec: --- apiVersion: apps/v1 kind: Deployment -metadata: - labels: - app: ml-pipeline - application-crd-id: kubeflow-pipelines - name: ml-pipeline - namespace: kubeflow -spec: - selector: - matchLabels: - app: ml-pipeline - application-crd-id: kubeflow-pipelines - template: - metadata: - annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: "true" - labels: - app: ml-pipeline - application-crd-id: kubeflow-pipelines - spec: - containers: - - env: - - name: AUTO_UPDATE_PIPELINE_DEFAULT_VERSION - valueFrom: - configMapKeyRef: - key: autoUpdatePipelineDefaultVersion - name: pipeline-install-config - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OBJECTSTORECONFIG_SECURE - value: "false" - - name: OBJECTSTORECONFIG_BUCKETNAME - valueFrom: - configMapKeyRef: - key: bucketName - name: pipeline-install-config - - name: DBCONFIG_USER - valueFrom: - secretKeyRef: - key: username - name: mysql-secret - - name: DBCONFIG_PASSWORD - valueFrom: - secretKeyRef: - key: password - name: mysql-secret - - name: DBCONFIG_DBNAME - valueFrom: - configMapKeyRef: - key: pipelineDb - name: pipeline-install-config - - name: DBCONFIG_HOST - valueFrom: - configMapKeyRef: - key: dbHost - name: pipeline-install-config - - name: DBCONFIG_PORT - valueFrom: - configMapKeyRef: - key: dbPort - name: pipeline-install-config - - name: DBCONFIG_CONMAXLIFETIMESEC - valueFrom: - configMapKeyRef: - key: ConMaxLifeTimeSec - name: pipeline-install-config - - name: OBJECTSTORECONFIG_ACCESSKEY - valueFrom: - secretKeyRef: - key: accesskey - name: mlpipeline-minio-artifact - - name: OBJECTSTORECONFIG_SECRETACCESSKEY - valueFrom: - secretKeyRef: - key: secretkey - name: mlpipeline-minio-artifact - image: gcr.io/ml-pipeline/api-server:1.7.0 - imagePullPolicy: IfNotPresent - livenessProbe: - exec: - command: - - wget - - -q - - -S - - -O - - '-' - - http://localhost:8888/apis/v1beta1/healthz - initialDelaySeconds: 3 - periodSeconds: 5 - timeoutSeconds: 2 - name: ml-pipeline-api-server - ports: - - containerPort: 8888 - name: http - - containerPort: 8887 - name: grpc - readinessProbe: - exec: - command: - - wget - - -q - - -S - - -O - - '-' - - http://localhost:8888/apis/v1beta1/healthz - initialDelaySeconds: 3 - periodSeconds: 5 - timeoutSeconds: 2 - resources: - requests: - cpu: 250m - memory: 500Mi - serviceAccountName: ml-pipeline ---- -apiVersion: apps/v1 -kind: Deployment metadata: labels: app: mysql @@ -2524,7 +2550,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.0 + image: gcr.io/ml-pipeline/inverse-proxy-agent:1.7.1 imagePullPolicy: IfNotPresent name: proxy-agent hostNetwork: true @@ -2553,7 +2579,7 @@ spec: - --configmap - workflow-controller-configmap - --executor-image - - gcr.io/ml-pipeline/argoexec:v3.1.6-patch-license-compliance + - gcr.io/ml-pipeline/argoexec:v3.1.14-license-compliance - --namespaced command: - workflow-controller @@ -2563,7 +2589,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.name - image: gcr.io/ml-pipeline/workflow-controller:v3.1.6-patch-license-compliance + image: gcr.io/ml-pipeline/workflow-controller:v3.1.14-license-compliance livenessProbe: failureThreshold: 3 httpGet: @@ -2634,38 +2660,10 @@ 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.0 + version: 1.7.1 info: - name: Console value: https://console.cloud.google.com/ai-platform/pipelines/clusters selector: matchLabels: application-crd-id: kubeflow-pipelines ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: minio-pvc - namespace: kubeflow -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - application-crd-id: kubeflow-pipelines - name: mysql-pv-claim - namespace: kubeflow -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi diff --git a/test-infra/kfp/Makefile b/test-infra/kfp/Makefile index 7866087e828..316b94a3f22 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.0 +PIPELINES_VERSION=1.7.1 PIPELINES_SRC_REPO=https://github.com/kubeflow/pipelines.git all: hydrate hydrate-kfp-manifests vet-kfp-manifests diff --git a/test-infra/kfp/README.md b/test-infra/kfp/README.md index f3955ebbb95..1c791f8eca9 100644 --- a/test-infra/kfp/README.md +++ b/test-infra/kfp/README.md @@ -10,4 +10,12 @@ make kfp-update ``` +1. Run: + + ```bash + make hydrate-kfp-manifests + ``` + + It generates raw k8s resources in acm-repos folder which is source of truth for the cluster via gitops. + 1. Commit the changes and send a PR. diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile index 14caa91c4dc..5d9ef664d47 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile @@ -1,11 +1,18 @@ -apiVersion: kpt.dev/v1alpha1 +apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: upstream upstream: type: git git: - commit: 6ccf5bcd0b9db955c91caab85fa130714527f414 repo: https://github.com/kubeflow/pipelines directory: /manifests/kustomize - ref: 1.7.0 + 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 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 1af2f9b43ae..64348f3f448 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: +metadata: # kpt-merge: /$(kfp-app-name) name: $(kfp-app-name) annotations: kubernetes-engine.cloud.google.com/icon: >- @@ -28,7 +28,6 @@ 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 d4c3ae3a867..703c1d92b41 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: +metadata: # kpt-merge: /cache-deployer-deployment 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 f853a321239..ca6ac639514 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-role 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 824a95726e6..d841e9c8c2d 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-rolebinding 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 \ No newline at end of file + name: kubeflow-pipelines-cache-deployer-sa 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 bb58deaf02e..b725a8a2313 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrole 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 c0f19d7575b..0f37be2e1fb 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-clusterrolebinding 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 affada3d100..429fce7a737 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-deployer-sa 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 2b941ae3f2a..ebecdc8930d 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,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - cache-deployer-clusterrole.yaml - cache-deployer-clusterrolebinding.yaml @@ -8,4 +7,3 @@ 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 22fb4f2f45a..2e1583b3705 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.0 + newTag: 1.7.1 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 58512e1e6ea..5d112653df5 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: +metadata: # kpt-merge: /cache-server name: cache-server labels: app: cache-server @@ -18,55 +18,48 @@ 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 de613b427b7..af71b5fdeb5 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-role 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 9c8924918fc..52093fbab24 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-binding 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 \ No newline at end of file + name: kubeflow-pipelines-cache 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 232ddd15cf0..556377caa74 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache 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 5916d541ec4..01f78de2ea5 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: +metadata: # kpt-merge: /cache-server name: cache-server spec: selector: app: cache-server ports: - port: 443 - targetPort: webhook-api \ No newline at end of file + targetPort: webhook-api 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 46ea8d17b18..70fe78c0611 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.0 + newTag: 1.7.1 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 576dce6f508..3ab9eb24006 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: +metadata: # kpt-merge: /mysql-secret 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 1ad5d1d83bf..61566e4d472 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: +metadata: # kpt-merge: /pipeline-install-config 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.0 + appVersion: 1.7.1 dbHost: mysql dbPort: "3306" mlmdDb: metadb @@ -68,7 +68,10 @@ data: ## any node and avoid defaulting to specific nodes. Allowed values are: ## 'false' and 'true'. cacheNodeRestrictions: "false" - ## ConMaxLifeTimeSec will set the connection max lifetime for MySQL + ## ConMaxLifeTime will set the connection max lifetime for MySQL ## this is very important to setup when using external databases. ## See this issue for more details: https://github.com/kubeflow/pipelines/issues/5329 - ConMaxLifeTimeSec: "120" + ## Note: this value should be a string that can be parsed by `time.ParseDuration`. + ## If this value doesn't include a unit abbreviation, the units will be assumed + ## to be nanoseconds. + ConMaxLifeTime: "120s" 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 9927d3e1005..c9e1498c8ce 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: +metadata: # kpt-merge: /ml-pipeline 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 957a001dd35..ca0fbe51bc9 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: +metadata: # kpt-merge: /ml-pipeline 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 4f283cd3ebb..8cfc52c2e45 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: +metadata: # kpt-merge: /ml-pipeline 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 4650ab569a7..20141b33870 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 4e80257c20d..d077a1eb479 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-binding 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 e604367357f..413753be824 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: +metadata: # kpt-merge: /kubeflow-pipelines-cache-role 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 5f98ee136f7..4a5f5fa6724 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: +metadata: # kpt-merge: /cache-server 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 a9a45e5eb1b..1c417754b85 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: +metadata: # kpt-merge: kubeflow/ml-pipeline-ui name: ml-pipeline-ui namespace: kubeflow spec: @@ -15,7 +15,7 @@ spec: --- apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: +metadata: # kpt-merge: kubeflow/ml-pipeline name: ml-pipeline namespace: kubeflow spec: @@ -39,7 +39,7 @@ spec: --- apiVersion: security.istio.io/v1beta1 kind: AuthorizationPolicy -metadata: +metadata: # kpt-merge: kubeflow/ml-pipeline-visualizationserver name: ml-pipeline-visualizationserver namespace: kubeflow spec: @@ -56,11 +56,10 @@ 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: +metadata: # kpt-merge: kubeflow/service-cache-server name: service-cache-server namespace: kubeflow spec: @@ -69,11 +68,10 @@ spec: app: cache-server rules: - {} - --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: +metadata: # kpt-merge: /ml-pipeline-ui name: ml-pipeline-ui spec: host: ml-pipeline-ui.kubeflow.svc.cluster.local @@ -83,7 +81,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: +metadata: # kpt-merge: /ml-pipeline name: ml-pipeline spec: host: ml-pipeline.kubeflow.svc.cluster.local @@ -93,7 +91,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: +metadata: # kpt-merge: /ml-pipeline-visualizationserver 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 72ebaf7ea30..e83a5eaf95e 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,6 +28,5 @@ 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 605f1ff0df7..8fb05e7affa 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: +metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-binding 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 a6ec9867253..b9aa12bd7e6 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: +metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-role 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 2babe9f43fe..5046300c913 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: +metadata: # kpt-merge: /metadata-writer 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 e030bd8a015..b975eb16fb2 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent-binding 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 b3053317b53..2660b25aefd 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent-role 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 1e165def422..e1198c575d4 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent 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 251c84b0eb4..9fe5179edec 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,6 +1,6 @@ apiVersion: metacontroller.k8s.io/v1alpha1 kind: CompositeController -metadata: +metadata: # kpt-merge: /kubeflow-pipelines-profile-controller name: kubeflow-pipelines-profile-controller spec: generateSelector: true 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 99dd9e21c61..94a18e9ef35 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: +metadata: # kpt-merge: /kubeflow-pipelines-profile-controller 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 9c5316ddfa7..49f4cccf7bc 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: +metadata: # kpt-merge: /kubeflow-pipelines-profile-controller 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 3539ff107e2..838a290b34c 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 dc352c941f4..8b9a24dcdb0 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 11f1f551bd0..033313b026d 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: +metadata: # kpt-merge: /ml-pipeline-ui-configmap 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 0403cc36274..7c27ed68451 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 0495d0017a1..2ceca575e28 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-binding 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 d08722c21e1..e2846ad9566 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-role 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 ea35690d816..157816f9ba1 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow 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 49bfe111b83..74b3550dc85 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,12 +1,6 @@ -# 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: +metadata: # kpt-merge: /kubeflow-pipelines-edit labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" name: kubeflow-pipelines-edit @@ -15,12 +9,10 @@ aggregationRule: - matchLabels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" rules: [] - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /kubeflow-pipelines-view labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" @@ -30,12 +22,10 @@ aggregationRule: - matchLabels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-view: "true" rules: [] - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /aggregate-to-kubeflow-pipelines-edit labels: rbac.authorization.kubeflow.org/aggregate-to-kubeflow-pipelines-edit: "true" name: aggregate-to-kubeflow-pipelines-edit @@ -78,12 +68,10 @@ rules: - delete - disable - enable - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /aggregate-to-kubeflow-pipelines-view 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 5e325bfc68e..1dcc3567091 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: +metadata: # kpt-merge: /ml-pipeline-viewer-crd-binding 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 e2bca79710e..7c3db1a3e62 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: +metadata: # kpt-merge: /ml-pipeline-viewer-controller-role name: ml-pipeline-viewer-controller-role rules: - apiGroups: 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 73e5d105063..1646700a897 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: +metadata: # kpt-merge: /ml-pipeline-viewer-crd 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 2b7991a9a0e..a0ad4a21ad9 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 32b9b986bf6..562ece2b773 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.0 + newTag: 1.7.1 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 e087d80aa90..981fc042872 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: +metadata: # kpt-merge: /metadata-envoy-deployment 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 42166c85ccd..22f5f32290b 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: +metadata: # kpt-merge: /metadata-envoy-service 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 08cc7e69278..7c1e933e577 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: +metadata: # kpt-merge: /metadata-grpc-configmap 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 d89770fa507..1b678e62ad4 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: +metadata: # kpt-merge: /metadata-grpc-deployment name: metadata-grpc-deployment labels: component: metadata-grpc-server @@ -50,14 +50,7 @@ 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 @@ -74,4 +67,3 @@ 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 c8e8d1fc86d..5ba79faa64c 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: +metadata: # kpt-merge: /metadata-grpc-server 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 7e7b73bf02d..276d499e379 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: +metadata: # kpt-merge: /metadata-grpc-service 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 e2ce8ca9720..9837114c62a 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: +metadata: # kpt-merge: /metadata-grpc-service 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 8f41789e8ee..1d17e145f26 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: +metadata: # kpt-merge: /metadata-grpc-service 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 029a6937cad..0127f00a56c 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,6 +1,5 @@ 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 01e000b65c0..68233816f7e 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: +metadata: # kpt-merge: kubeflow/metadata-grpc 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 fa67b8a9667..661a5653a3d 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,17 +1,14 @@ 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: @@ -22,13 +19,10 @@ 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 f5a7332f44c..9fe31708d0d 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: +metadata: # kpt-merge: /metadata-db name: metadata-db labels: component: db @@ -49,4 +49,3 @@ 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 b1c083d9f45..702f9218a21 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: +metadata: # kpt-merge: /metadata-mysql 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 b7a6401714a..d02a5f4843f 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: +metadata: # kpt-merge: /metadata-db 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 03023a3404c..fb388715e6f 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: +metadata: # kpt-merge: /metadata-grpc-deployment name: metadata-grpc-deployment spec: template: @@ -9,17 +9,12 @@ 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 623e183494b..985b79711af 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 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /scheduledworkflows.kubeflow.org name: scheduledworkflows.kubeflow.org spec: group: kubeflow.org @@ -15,4 +15,4 @@ spec: versions: - name: v1beta1 served: true - storage: true \ No newline at end of file + 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 dcb5db0f88a..8b571d6cd06 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 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /viewers.kubeflow.org name: viewers.kubeflow.org spec: group: kubeflow.org 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 aa65bd9bbf3..c24c312459a 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: +metadata: # kpt-merge: /kubeflow-pipelines-container-builder 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 13f60514a32..6a9829e0ce6 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: +metadata: # kpt-merge: /kfp-launcher 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 a648a0d106b..eb9a05fbffd 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.0 + newTag: 1.7.1 - name: gcr.io/ml-pipeline/persistenceagent - newTag: 1.7.0 + newTag: 1.7.1 - name: gcr.io/ml-pipeline/scheduledworkflow - newTag: 1.7.0 + newTag: 1.7.1 - name: gcr.io/ml-pipeline/frontend - newTag: 1.7.0 + newTag: 1.7.1 - name: gcr.io/ml-pipeline/viewer-crd-controller - newTag: 1.7.0 + newTag: 1.7.1 - name: gcr.io/ml-pipeline/visualization-server - newTag: 1.7.0 + newTag: 1.7.1 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 8fb4c30c640..8d1d3fadbf0 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.0 + newTag: 1.7.1 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 c51903d3568..81e351ccdc6 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: +metadata: # kpt-merge: /metadata-writer 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 06317b0845c..f7b698d0eab 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: +metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-role 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 5a6c1fef249..5d5b3cf700c 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: +metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer-binding 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 \ No newline at end of file + name: kubeflow-pipelines-metadata-writer 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 77812949a84..da7a704f714 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: +metadata: # kpt-merge: /kubeflow-pipelines-metadata-writer 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 6fe41f52394..1d5e6227989 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: +metadata: # kpt-merge: /ml-pipeline labels: app: ml-pipeline name: ml-pipeline @@ -58,11 +58,11 @@ spec: configMapKeyRef: name: pipeline-install-config key: dbPort - - name: DBCONFIG_CONMAXLIFETIMESEC + - name: DBCONFIG_CONMAXLIFETIME valueFrom: configMapKeyRef: name: pipeline-install-config - key: ConMaxLifeTimeSec + key: ConMaxLifeTime - name: OBJECTSTORECONFIG_ACCESSKEY valueFrom: secretKeyRef: @@ -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 ab0ee6d2d3e..bef610a5296 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: +metadata: # kpt-merge: /ml-pipeline 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 c4ef4f5ffe6..d06151c405d 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: +metadata: # kpt-merge: /ml-pipeline labels: app: ml-pipeline name: ml-pipeline @@ -10,4 +10,4 @@ roleRef: name: ml-pipeline subjects: - kind: ServiceAccount - name: ml-pipeline \ No newline at end of file + name: ml-pipeline 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 95ff3141e61..b23ff8ed5c2 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: +metadata: # kpt-merge: /ml-pipeline 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 4ac2ba4ac90..c77c2fa8afc 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,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /ml-pipeline name: ml-pipeline spec: ports: @@ -13,4 +13,4 @@ spec: protocol: TCP targetPort: 8887 selector: - app: ml-pipeline \ No newline at end of file + app: ml-pipeline 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 bc5032e51a8..330b73886f3 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent 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 830ee8b14e7..f2e7e2c50a9 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent-role name: ml-pipeline-persistenceagent-role rules: - apiGroups: @@ -18,4 +18,4 @@ rules: verbs: - get - list - - watch \ No newline at end of file + - watch 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 a690f20cbf0..af6cd47248e 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: +metadata: # kpt-merge: /ml-pipeline-persistenceagent-binding 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 4725287b375..df2fd35217e 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: - name: ml-pipeline-persistenceagent \ No newline at end of file +metadata: # kpt-merge: /ml-pipeline-persistenceagent + name: ml-pipeline-persistenceagent 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 ac20e5736f2..5b78a90e836 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow 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 187272a9768..6500a667d82 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-role 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 e9429f36624..a1ebaea9591 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow-binding 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 \ No newline at end of file + name: ml-pipeline-scheduledworkflow 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 285c13742fd..ae8663b185c 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: +metadata: # kpt-merge: /ml-pipeline-scheduledworkflow 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 85b64229767..0c22009a53f 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: +metadata: # kpt-merge: /ml-pipeline-ui-configmap 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 8e8923a3659..3bd96e87a38 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 0fc42c94fe6..030c35d2b66 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 e8298354200..86ed7c59733 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 06bc4453843..720c5eb981f 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: - name: ml-pipeline-ui \ No newline at end of file +metadata: # kpt-merge: /ml-pipeline-ui + name: ml-pipeline-ui 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 093ad8ca2c9..e6557a8a6ef 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: +metadata: # kpt-merge: /ml-pipeline-ui 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 617801d11ff..19ea7410cfc 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: +metadata: # kpt-merge: /ml-pipeline-viewer-crd 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 73bf032fdd8..f8be776285d 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: +metadata: # kpt-merge: /ml-pipeline-viewer-controller-role 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 bd1f77a8379..15ee6ae56d1 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: +metadata: # kpt-merge: /ml-pipeline-viewer-crd-binding 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 5dd08f88439..9836c35e7e6 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: +metadata: # kpt-merge: /ml-pipeline-viewer-crd-service-account 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 b6d1e1184e6..5b61d625489 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: +metadata: # kpt-merge: /ml-pipeline-visualizationserver 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 e1bbc6ad273..605f8d3575a 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: +metadata: # kpt-merge: /ml-pipeline-visualizationserver 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 83c7dd67504..e91c8851782 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: +metadata: # kpt-merge: /ml-pipeline-visualizationserver name: ml-pipeline-visualizationserver spec: ports: @@ -9,4 +9,4 @@ spec: protocol: TCP targetPort: 8888 selector: - app: ml-pipeline-visualizationserver \ No newline at end of file + app: ml-pipeline-visualizationserver 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 e81fd91a53f..7eabde7c529 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: +metadata: # kpt-merge: /pipeline-runner 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 9adae61887f..31b06d291d7 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: +metadata: # kpt-merge: /pipeline-runner-binding 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 8cb2c669fb2..2aa6ae76feb 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: +metadata: # kpt-merge: /pipeline-runner 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 932133c82a6..d9d9867528b 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: +metadata: # kpt-merge: /kubeflow-pipelines-viewer 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 df0f654c0f8..eca72f5f369 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,8 +1,6 @@ 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 3c65856e7b7..db51415ffc4 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: +metadata: # kpt-merge: /$(kfp-cluster-scoped-namespace) 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 d008e3bc767..f23e510d50d 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: +metadata: # kpt-merge: /ml-pipeline-ui name: ml-pipeline-ui spec: template: @@ -25,11 +25,10 @@ spec: secretKeyRef: name: mlpipeline-minio-artifact key: secretkey - --- apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /ml-pipeline name: ml-pipeline spec: template: @@ -58,4 +57,4 @@ spec: key: minioServiceRegion - name: OBJECTSTORECONFIG_PORT value: "" - name: ml-pipeline-api-server \ No newline at end of file + name: ml-pipeline-api-server 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 39b9c7d95c6..f13bac28d5f 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,23 +1,19 @@ 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 db350a6f5b0..80fcc8befb9 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,13 +1,11 @@ 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 \ No newline at end of file + disableNameSuffixHash: true 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 56979c42e94..825bddb74c4 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: +metadata: # kpt-merge: /minio 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 7dd18174965..9b9c8dfe770 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: +metadata: # kpt-merge: /minio-service name: minio-service spec: ports: @@ -8,4 +8,4 @@ spec: targetPort: 9000 protocol: TCP selector: - app: minio \ No newline at end of file + app: minio 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 23030cea7c3..c719d1cd1db 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,19 +1,16 @@ 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 10e1f6aafe8..ca8c87b05af 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: +metadata: # kpt-merge: /cloudsqlproxy name: cloudsqlproxy labels: app: cloudsqlproxy @@ -18,16 +18,13 @@ spec: containers: - image: gcr.io/cloudsql-docker/gce-proxy:1.14 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", "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: 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 a4cc9c43dfe..6ccb0aec99d 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: +metadata: # kpt-merge: /kubeflow-pipelines-cloudsql-proxy 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 a336cb50f9e..0a7d5b67a82 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,6 +1,5 @@ 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 f97dbc3a20a..9135855afc8 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: +metadata: # kpt-merge: /mysql 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 5e725b536d2..b0763925489 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: +metadata: # kpt-merge: /ml-pipeline 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 d25157b3bd8..e483a5a4ffc 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.0 + newTag: 1.7.1 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 c469f7acb93..47c724d9423 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: +metadata: # kpt-merge: /inverse-proxy-config 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 faf3e473098..46333fca732 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: +metadata: # kpt-merge: /proxy-agent 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 d6c03d5d043..b7b4949ed56 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: +metadata: # kpt-merge: /proxy-agent-runner 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 72f1fc0d6f9..e0e0f65e36a 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: +metadata: # kpt-merge: /proxy-agent-runner 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 af8b0c3c2d6..9266a041421 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: +metadata: # kpt-merge: /proxy-agent-runner 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 e96b88413fb..6730f947e26 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,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: # Application controller is used to provide Google Cloud Console integration. - ../../third-party/application @@ -11,20 +10,16 @@ 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 877ad81746a..81e6731c337 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,11 +1,9 @@ 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 bb85c95eb0d..905255d9914 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: +metadata: # kpt-merge: /minio 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 2aa4f937685..4e7f356c324 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: +metadata: # kpt-merge: /kubeflow-pipelines-minio-gcs-gateway 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 7dd18174965..9b9c8dfe770 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: +metadata: # kpt-merge: /minio-service name: minio-service spec: ports: @@ -8,4 +8,4 @@ spec: targetPort: 9000 protocol: TCP selector: - app: minio \ No newline at end of file + app: minio 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 b0f866295b9..1cf7908f75c 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,6 +2,5 @@ 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 87b8fda3914..75f530c955a 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: +metadata: # kpt-merge: /workflow-controller-configmap 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 42dda7adc03..47d71413d60 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,6 +2,5 @@ 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 24303c0081d..39a7488cd53 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,12 +1,12 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap data: # References: - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/config/config.go - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.md - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.yaml + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/config/config.go + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.md + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.yaml # Emissary Executor: https://argoproj.github.io/argo-workflows/workflow-executors/#emissary-emissary containerRuntimeExecutor: emissary 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 6800d9e0102..1725660ec25 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,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: - ../../base/installs/multi-user - ../../base/metadata/overlays/db @@ -11,13 +10,11 @@ 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 42dda7adc03..47d71413d60 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,6 +2,5 @@ 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 6da9a704ae8..cebfc871e6e 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,12 +1,12 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap data: # References: - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/config/config.go - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.md - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.yaml + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/config/config.go + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.md + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.yaml # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654. containerRuntimeExecutor: pns 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 1ea99e57eef..721dcbc084a 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,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: - ../../base/installs/multi-user - ../../base/metadata/base @@ -11,13 +10,11 @@ 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 b0f866295b9..1cf7908f75c 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,6 +2,5 @@ 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 6d83453f7c3..d0a60c2f61e 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,12 +1,12 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap data: # References: - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/config/config.go - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.md - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.yaml + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/config/config.go + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.md + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.yaml # pns executor is a more portable default, see https://github.com/kubeflow/pipelines/issues/1654. # However, it is flaky for containers that run really fast, see https://github.com/kubeflow/pipelines/issues/5285. 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 cb840c9689f..342bee8387d 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,19 +1,16 @@ 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/hack/test.sh b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/hack/test.sh index 58d938a093d..7e251fbf614 100755 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/hack/test.sh +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/hack/test.sh @@ -56,7 +56,4 @@ do kustomize build "${MANIFESTS_DIR}/${path}" >/dev/null done -# TODO(Bobgy): fix this for kpt v1 -# verify these manifests work with kpt -# to prevent issues like https://github.com/kubeflow/pipelines/issues/5368 -# kpt cfg tree "${MANIFESTS_DIR}" >/dev/null +kpt pkg tree "${MANIFESTS_DIR}" >/dev/null 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 83c54aa99c3..9cbbf1427e5 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,10 +1,8 @@ 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 3af7efd42bc..7bf60ac0518 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,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: # Or github.com/kubeflow/pipelines/manifests/kustomize/env/gcp?ref=1.0.0 - ../env/gcp @@ -10,24 +9,20 @@ 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 8cffbb44fde..59c92dee981 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: +metadata: # kpt-merge: /controller-manager 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 ac061350876..6ee6d702d4d 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: +metadata: # kpt-merge: /application-manager-role 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 24b383a1802..11021b6c20a 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: +metadata: # kpt-merge: /application-manager-rolebinding 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 bd130391510..22f46e0f75d 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: +metadata: # kpt-merge: /application 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 e4b6086bad5..b1505394e28 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: +metadata: # kpt-merge: /controller-manager-service 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 \ No newline at end of file + - port: 443 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 e17455d521c..9b1c850cea4 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: +metadata: # kpt-merge: /applications.app.k8s.io 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 c35e3eebcb9..c02d8ec7670 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,6 +1,5 @@ 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/.krmignore b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/.krmignore new file mode 100644 index 00000000000..045951300cf --- /dev/null +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/.krmignore @@ -0,0 +1 @@ +upstream diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/Kptfile new file mode 100644 index 00000000000..bf0baf9863a --- /dev/null +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/Kptfile @@ -0,0 +1,6 @@ +apiVersion: kpt.dev/v1 +kind: Kptfile +metadata: + name: argo +info: + description: argo Kptfile in order to ignore upstream/ folder. diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/README.md b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/README.md index 77962195720..b5f82380158 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/README.md +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/README.md @@ -20,6 +20,10 @@ Refer to [third_party/argo/README.md](../../../../third_party/argo/README.md). ### Upgrade argo manifests +Requirement: + +Use kpt version above 1.0.0-beta.6, refer to [kpt installation](https://kpt.dev/installation/) for downloading kpt. + As one step of above, we need to upgrade argo manifests in this folder. 1. Run: @@ -29,5 +33,3 @@ As one step of above, we need to upgrade argo manifests in this folder. ``` Note, argo version is pulled from [third_party/argo/VERSION](../../../../third_party/argo/VERSION). Edit the VERSION file first. - -2. Manually edit [YAML patches](upstream/manifests/namespace-install/overlays) to JSON patches, because YAML patches confuses kpt, refer to [#5368](https://github.com/kubeflow/pipelines/issues/5368). 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 81c3b931643..aebad617040 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,13 +1,10 @@ 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 51962aa60e4..120ad586972 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,16 +1,15 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap data: # References: - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/config/config.go - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.md - # * https://github.com/argoproj/argo-workflows/blob/v3.1.6/docs/workflow-controller-configmap.yaml + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/config/config.go + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.md + # * https://github.com/argoproj/argo-workflows/blob/v3.1.14/docs/workflow-controller-configmap.yaml # 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 c5bfa821422..d4ee0921bb0 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,18 +1,18 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /workflow-controller name: workflow-controller spec: template: spec: containers: - name: workflow-controller - image: gcr.io/ml-pipeline/workflow-controller:v3.1.6-patch-license-compliance + image: gcr.io/ml-pipeline/workflow-controller:v3.1.14-license-compliance args: - --configmap - workflow-controller-configmap - --executor-image - - gcr.io/ml-pipeline/argoexec:v3.1.6-patch-license-compliance + - gcr.io/ml-pipeline/argoexec:v3.1.14-license-compliance resources: requests: cpu: 100m 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 3bb1a466df2..bdbb8ace177 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,6 +1,5 @@ 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 @@ -8,11 +7,10 @@ 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 \ No newline at end of file + path: workflow-controller-clusterrolebinding-patch.json 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 1a861c499cc..7dbbc00368d 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,15 +1,12 @@ 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/argo/upstream/manifests/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/Kptfile index 5dd50819bbb..d950696fb09 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/Kptfile +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/Kptfile @@ -1,11 +1,18 @@ -apiVersion: kpt.dev/v1alpha1 +apiVersion: kpt.dev/v1 kind: Kptfile metadata: name: manifests upstream: type: git git: - commit: a245fe67db56d2808fb78c6079d08404cbee91aa repo: https://github.com/argoproj/argo-workflows directory: /manifests - ref: v3.1.1 + ref: v3.1.14 + updateStrategy: resource-merge +upstreamLock: + type: git + git: + repo: https://github.com/argoproj/argo-workflows + directory: /manifests + ref: v3.1.14 + commit: 14e1278572b28d8b1854858ce7de355ce60199c9 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-deployment.yaml index d01698af536..189b104119a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /argo-server name: argo-server spec: selector: @@ -19,7 +19,7 @@ spec: capabilities: drop: - ALL - args: [ server ] + args: [server] ports: - name: web containerPort: 2746 @@ -35,7 +35,7 @@ spec: name: tmp volumes: - name: tmp - emptyDir: { } + emptyDir: {} securityContext: runAsNonRoot: true nodeSelector: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-sa.yaml index 1d07b8da9e1..0f5cab2bc0b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /argo-server name: argo-server diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-service.yaml index 0c6e58d30ed..6c2207ac38f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/argo-server-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /argo-server name: argo-server spec: selector: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/kustomization.yaml index 3817bd729b1..e17bc754ce5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/argo-server/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - argo-server-deployment.yaml - argo-server-sa.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml index 31d1586b5f9..a5129ef46de 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml @@ -1,7 +1,7 @@ # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /clusterworkflowtemplates.argoproj.io name: clusterworkflowtemplates.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_cronworkflows.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_cronworkflows.yaml index 7956d040f33..dc4dfa72e0f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_cronworkflows.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_cronworkflows.yaml @@ -1,7 +1,7 @@ # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /cronworkflows.argoproj.io name: cronworkflows.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml index 11bef39e4d0..f22205c8a15 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml @@ -1,7 +1,7 @@ # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workfloweventbindings.argoproj.io name: workfloweventbindings.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflows.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflows.yaml index dbfe8979aff..be666e1d8be 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflows.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflows.yaml @@ -1,7 +1,7 @@ # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workflows.argoproj.io name: workflows.argoproj.io spec: group: argoproj.io @@ -14042,6 +14042,198 @@ spec: properties: artifactRepositoryRef: properties: + artifactRepository: + properties: + archiveLogs: + type: boolean + artifactory: + properties: + passwordSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + repoURL: + type: string + usernameSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + gcs: + properties: + bucket: + type: string + keyFormat: + type: string + serviceAccountKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + hdfs: + properties: + addresses: + items: + type: string + type: array + force: + type: boolean + hdfsUser: + type: string + krbCCacheSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbConfigConfigMap: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbKeytabSecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + krbRealm: + type: string + krbServicePrincipalName: + type: string + krbUsername: + type: string + pathFormat: + type: string + type: object + oss: + properties: + accessKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + bucket: + type: string + createBucketIfNotPresent: + type: boolean + endpoint: + type: string + keyFormat: + type: string + lifecycleRule: + properties: + markDeletionAfterDays: + format: int32 + type: integer + markInfrequentAccessAfterDays: + format: int32 + type: integer + type: object + secretKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + securityToken: + type: string + type: object + s3: + properties: + accessKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + bucket: + type: string + createBucketIfNotPresent: + properties: + objectLocking: + type: boolean + type: object + endpoint: + type: string + insecure: + type: boolean + keyFormat: + type: string + keyPrefix: + type: string + region: + type: string + roleARN: + type: string + secretKeySecret: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + useSDKCreds: + type: boolean + type: object + type: object configMap: type: string default: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml index b5662e7c541..2586a5d2f0b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml @@ -1,7 +1,7 @@ # This is an auto-generated file. DO NOT EDIT apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workflowtemplates.argoproj.io name: workflowtemplates.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/kustomization.yaml index a593d88d02d..a6245453ea3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/full/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - argoproj.io_clusterworkflowtemplates.yaml - argoproj.io_cronworkflows.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/kustomization.yaml index 3ccdade18fc..25ffbeccf0a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/kustomization.yaml @@ -1,5 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - minimal diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_clusterworkflowtemplates.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_clusterworkflowtemplates.yaml index 889dfe2f508..90c8fb8adc2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_clusterworkflowtemplates.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_clusterworkflowtemplates.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /clusterworkflowtemplates.argoproj.io name: clusterworkflowtemplates.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_cronworkflows.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_cronworkflows.yaml index 812cf114348..1809239a5a9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_cronworkflows.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_cronworkflows.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /cronworkflows.argoproj.io name: cronworkflows.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workfloweventbindings.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workfloweventbindings.yaml index 22e2ecf0f6b..ab81216d69a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workfloweventbindings.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workfloweventbindings.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workfloweventbindings.argoproj.io name: workfloweventbindings.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflows.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflows.yaml index 6e646adc7d4..f13fb38dbba 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflows.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflows.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workflows.argoproj.io name: workflows.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflowtemplates.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflowtemplates.yaml index 8165ec25b8b..d2c87bf5715 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflowtemplates.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/argoproj.io_workflowtemplates.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /workflowtemplates.argoproj.io name: workflowtemplates.argoproj.io spec: group: argoproj.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/kustomization.yaml index a593d88d02d..a6245453ea3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/crds/minimal/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - argoproj.io_clusterworkflowtemplates.yaml - argoproj.io_cronworkflows.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/kustomization.yaml index 0b9a73341d7..02094eb9c9d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - crds - workflow-controller diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/kustomization.yaml index 5ed907d651e..e3b2bf3b74b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - workflow-controller-configmap.yaml - workflow-controller-deployment.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-configmap.yaml index d28f4edb3f2..3d1f2534d61 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-configmap.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-deployment.yaml index 3deacb6e026..86676a377d8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /workflow-controller name: workflow-controller spec: selector: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml index d040adaa08a..c646a2482fa 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /workflow-controller-metrics name: workflow-controller-metrics labels: app: workflow-controller diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-sa.yaml index f3d5885df98..bc31906f374 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/base/workflow-controller/workflow-controller-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /argo name: argo diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml index f954115b005..506221526aa 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterole.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-server-cluster-role name: argo-server-cluster-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml index 6d7ac27ff5e..1e54be5bcfb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/argo-server-clusterolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: +metadata: # kpt-merge: /argo-server-binding name: argo-server-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/kustomization.yaml index 6ae17fe059a..91d213a3943 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/argo-server-rbac/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - argo-server-clusterole.yaml - argo-server-clusterolebinding.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/kustomization.yaml index a1698bd2ac7..7f5d34ea7f8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base - ./workflow-controller-rbac diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/kustomization.yaml index 0ce4eff69b5..ab7574c6ea5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - workflow-aggregate-roles.yaml - workflow-controller-clusterrole.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-aggregate-roles.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-aggregate-roles.yaml index b632e22bc35..4b83b5986d2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-aggregate-roles.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-aggregate-roles.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-aggregate-to-view name: argo-aggregate-to-view labels: rbac.authorization.k8s.io/aggregate-to-view: "true" @@ -22,11 +22,10 @@ rules: - get - list - watch - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-aggregate-to-edit name: argo-aggregate-to-edit labels: rbac.authorization.k8s.io/aggregate-to-edit: "true" @@ -53,11 +52,10 @@ rules: - patch - update - watch - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-aggregate-to-admin name: argo-aggregate-to-admin labels: rbac.authorization.k8s.io/aggregate-to-admin: "true" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrole.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrole.yaml index 0bc7edd4f12..fbe9456779d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrole.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrole.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-cluster-role name: argo-cluster-role rules: - apiGroups: @@ -83,10 +83,10 @@ rules: - create - patch - apiGroups: - - "policy" + - "policy" resources: - - poddisruptionbudgets + - poddisruptionbudgets verbs: - - create - - get - - delete + - create + - get + - delete diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml index b4e54ea67c9..0988ebd474b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-clusterrolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: +metadata: # kpt-merge: /argo-binding name: argo-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-role.yaml index a4693c35864..4a9ae4fc181 100755 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /argo-role name: argo-role rules: - apiGroups: @@ -17,4 +17,3 @@ rules: - secrets verbs: - get - diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml index 191f34d44cd..cb4f33d0431 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/cluster-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /argo-binding name: argo-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-role.yaml index 546be634146..ca14f4c34f5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /argo-server-role name: argo-server-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-rolebinding.yaml index d92f0a50965..6d0e838150f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/argo-server-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /argo-server-binding name: argo-server-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/kustomization.yaml index 57a0718f655..c1ca948941f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/argo-server-rbac/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - argo-server-role.yaml - argo-server-rolebinding.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/kustomization.yaml index 808268c9b0e..a3c7fe6fbcf 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/kustomization.yaml @@ -1,21 +1,19 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base - ./argo-server-rbac - ./workflow-controller-rbac - patchesJson6902: - target: version: v1 group: apps kind: Deployment name: workflow-controller - path: ./overlays/workflow-controller-deployment.json + path: ./overlays/workflow-controller-deployment.yaml - target: version: v1 group: apps kind: Deployment name: argo-server - path: ./overlays/argo-server-deployment.json + path: ./overlays/argo-server-deployment.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.json b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.json deleted file mode 100644 index b8d82b0c752..00000000000 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "op": "add", - "path": "/spec/template/spec/containers/0/args/-", - "value": "--namespaced" - } -] diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.yaml new file mode 100644 index 00000000000..90fd8a53dcb --- /dev/null +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/argo-server-deployment.yaml @@ -0,0 +1,3 @@ +- op: add + path: /spec/template/spec/containers/0/args/- + value: --namespaced diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.json b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.json deleted file mode 100644 index b8d82b0c752..00000000000 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - { - "op": "add", - "path": "/spec/template/spec/containers/0/args/-", - "value": "--namespaced" - } -] diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.yaml new file mode 100644 index 00000000000..90fd8a53dcb --- /dev/null +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/overlays/workflow-controller-deployment.yaml @@ -0,0 +1,3 @@ +- op: add + path: /spec/template/spec/containers/0/args/- + value: --namespaced diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/kustomization.yaml index f7b23b2b0bc..1f9553fe592 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - workflow-controller-role.yaml - workflow-controller-rolebinding.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml index 908a73626a4..65613ed92d9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /argo-role name: argo-role rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml index f8ac7ec0d60..300cb6cd04c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/namespace-install/workflow-controller-rbac/workflow-controller-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /argo-binding name: argo-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -9,4 +9,3 @@ roleRef: subjects: - kind: ServiceAccount name: argo - diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/argo-server-sso-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/argo-server-sso-secret.yaml index 173d6b314a4..cc6fab198dd 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/argo-server-sso-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/argo-server-sso-secret.yaml @@ -1,6 +1,6 @@ kind: Secret apiVersion: v1 -metadata: +metadata: # kpt-merge: /argo-server-sso name: argo-server-sso stringData: clientID: argo-server diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/artifact-repositories-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/artifact-repositories-configmap.yaml index cd2033a3d68..b548f41a416 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/artifact-repositories-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/artifact-repositories-configmap.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /artifact-repositories name: artifact-repositories annotations: # you'll want to change the default over time, e.g. when you move to new storage solution, @@ -31,4 +31,4 @@ data: secretKeySecret: name: my-minio-cred key: secretkey - empty: "" \ No newline at end of file + empty: "" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/cluster-workflow-template-rbac.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/cluster-workflow-template-rbac.yaml index 388ea11b53b..8b3c37c9cb2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/cluster-workflow-template-rbac.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/cluster-workflow-template-rbac.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-server-clusterworkflowtemplate-role name: argo-server-clusterworkflowtemplate-role rules: - apiGroups: @@ -18,7 +18,7 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /argo-clusterworkflowtemplate-role name: argo-clusterworkflowtemplate-role rules: - apiGroups: @@ -33,7 +33,7 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: +metadata: # kpt-merge: /argo-clusterworkflowtemplate-role-binding name: argo-clusterworkflowtemplate-role-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ subjects: --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: +metadata: # kpt-merge: /argo-server-clusterworkflowtemplate-role-binding name: argo-server-clusterworkflowtemplate-role-binding roleRef: apiGroup: rbac.authorization.k8s.io @@ -56,4 +56,3 @@ subjects: - kind: ServiceAccount name: argo-server namespace: argo - diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-clusterrole.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-clusterrole.yaml index d6678596491..9d5e609cd7b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-clusterrole.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-clusterrole.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole -metadata: +metadata: # kpt-merge: /kubelet-executor name: kubelet-executor rules: # This allows the kubelet executor. @@ -9,4 +9,4 @@ rules: resources: - nodes/proxy verbs: - - get \ No newline at end of file + - get diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-default-clusterrolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-default-clusterrolebinding.yaml index f0aff8e6c48..3697ef637aa 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-default-clusterrolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kubelet-executor-default-clusterrolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -metadata: +metadata: # kpt-merge: /kubelet-executor-default name: kubelet-executor-default roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kustomization.yaml index b809453642d..8d9f7a8d40f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../../namespace-install - minio @@ -12,7 +11,6 @@ resources: - workflow-default-rolebinding.yaml - cluster-workflow-template-rbac.yaml - artifact-repositories-configmap.yaml - patchesStrategicMerge: - overlays/workflow-controller-configmap.yaml - overlays/argo-server-deployment.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/kustomization.yaml index 2d81059de41..1199d38982b 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - minio-deploy.yaml - minio-service.yaml - - my-minio-cred-secret.yaml \ No newline at end of file + - my-minio-cred-secret.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-deploy.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-deploy.yaml index 967b917413d..4a75c8316ef 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-deploy.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-deploy.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /minio name: minio labels: app: minio @@ -39,4 +39,4 @@ spec: path: /minio/health/live port: 9000 initialDelaySeconds: 5 - periodSeconds: 10 \ No newline at end of file + periodSeconds: 10 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-pod.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-pod.yaml index 707fea3835a..8c617a68fa8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-pod.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-pod.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Pod -metadata: +metadata: # kpt-merge: /minio name: minio labels: app: minio @@ -31,4 +31,4 @@ spec: path: /minio/health/live port: 9000 initialDelaySeconds: 5 - periodSeconds: 10 \ No newline at end of file + periodSeconds: 10 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-service.yaml index 6abf4af4471..e7b017d8eef 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/minio-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /minio name: minio labels: app: minio @@ -11,4 +11,3 @@ spec: - protocol: TCP port: 9000 targetPort: 9000 - diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/my-minio-cred-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/my-minio-cred-secret.yaml index 7a29e26b985..52d9564592f 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/my-minio-cred-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/minio/my-minio-cred-secret.yaml @@ -3,7 +3,7 @@ stringData: accesskey: admin secretkey: password kind: Secret -metadata: +metadata: # kpt-merge: /my-minio-cred name: my-minio-cred labels: app: minio diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/argo-server-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/argo-server-deployment.yaml index eab93f168c2..9fab5a80f1c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/argo-server-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/argo-server-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /argo-server name: argo-server spec: template: @@ -13,4 +13,4 @@ spec: - --auth-mode - server - --auth-mode - - client \ No newline at end of file + - client diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/workflow-controller-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/workflow-controller-configmap.yaml index c358ece92ec..4cc36b4c6f2 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/workflow-controller-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/overlays/workflow-controller-configmap.yaml @@ -57,5 +57,5 @@ data: scope: sensor-logs url: http://logging-facility?namespace=${metadata.namespace}&podName=${metadata.name}&startedAt=${status.startedAt}&finishedAt=${status.finishedAt} kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/kustomization.yaml index 4fa48f13b70..32db8231d01 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - prometheus-deployment.yaml - prometheus-config-cluster.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-config-cluster.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-config-cluster.yaml index e5b849d3822..c99a33569dc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-config-cluster.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-config-cluster.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ConfigMap -metadata: +metadata: # kpt-merge: /prometheus-config name: prometheus-config data: prometheus.yaml: | diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-deployment.yaml index 886b4e3a176..f604b2ab38d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-deployment.yaml @@ -8,7 +8,7 @@ # be modified if the default is overriden. apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /prometheus name: prometheus spec: replicas: 1 @@ -27,11 +27,9 @@ spec: args: - --config.file=/config/prometheus.yaml volumeMounts: - - name: config - mountPath: /config + - name: config + mountPath: /config volumes: - name: config configMap: name: prometheus-config - - diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-service.yaml index 4f07a56d0fe..26ce49d6e18 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/prometheus/prometheus-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /prometheus name: prometheus spec: selector: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/argo-workflows-webhook-clients-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/argo-workflows-webhook-clients-secret.yaml index 566b49951f2..079013e8d7c 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/argo-workflows-webhook-clients-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/argo-workflows-webhook-clients-secret.yaml @@ -1,6 +1,6 @@ kind: Secret apiVersion: v1 -metadata: +metadata: # kpt-merge: /argo-workflows-webhook-clients name: argo-workflows-webhook-clients # The data keys must be the name of a service account. stringData: @@ -17,6 +17,6 @@ stringData: type: github secret: "shh!" # https://docs.gitlab.com/ee/user/project/integrations/webhooks.html - gitlab.com: | + gitlab.com: |- type: gitlab - secret: "shh!" \ No newline at end of file + secret: "shh!" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-rolebinding.yaml index 6477163c4ec..959f8bd55ce 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /github.com name: github.com roleRef: apiGroup: rbac.authorization.k8s.io @@ -9,4 +9,4 @@ roleRef: subjects: - kind: ServiceAccount name: github.com - namespace: argo \ No newline at end of file + namespace: argo diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-sa.yaml index 7e42d02edb2..a2591092f65 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/github.com-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /github.com name: github.com diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/kustomization.yaml index ffef982a706..162751ce9cc 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - submit-workflow-template-role.yaml - github.com-sa.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/submit-workflow-template-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/submit-workflow-template-role.yaml index 82dd187abd3..b1dee3fedb8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/submit-workflow-template-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/webhooks/submit-workflow-template-role.yaml @@ -2,7 +2,7 @@ # You could tighten this further (but perhaps impractically) by using `resourceNames` apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /submit-workflow-template name: submit-workflow-template rules: - apiGroups: @@ -22,4 +22,4 @@ rules: resources: - workflows verbs: - - create \ No newline at end of file + - create diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-default-rolebinding.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-default-rolebinding.yaml index 9cca0400776..52ec46ba539 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-default-rolebinding.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-default-rolebinding.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /workflow-default-binding name: workflow-default-binding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-role.yaml index d7f4ee34f50..ace0d759bfb 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/base/workflow-role.yaml @@ -1,7 +1,7 @@ # https://argoproj.github.io/argo-workflows/workflow-rbac/ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /workflow-role name: workflow-role rules: # pod get/watch is used to identify the container IDs of the current pod @@ -47,4 +47,4 @@ rules: - workflows verbs: - create - - get \ No newline at end of file + - get diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/minimal/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/minimal/kustomization.yaml index aa0b761e856..27bb5cb0b48 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/minimal/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/minimal/kustomization.yaml @@ -1,5 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/argo-mysql-config-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/argo-mysql-config-secret.yaml index ad496bc6137..cfe014fef26 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/argo-mysql-config-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/argo-mysql-config-secret.yaml @@ -3,7 +3,7 @@ stringData: username: mysql password: password kind: Secret -metadata: +metadata: # kpt-merge: /argo-mysql-config name: argo-mysql-config labels: app: mysql diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/kustomization.yaml index 97b3ca0a1ed..edacf51ff4a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/kustomization.yaml @@ -1,11 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base - argo-mysql-config-secret.yaml - mysql-deployment.yaml - mysql-service.yaml - patchesStrategicMerge: - - overlays/workflow-controller-configmap.yaml \ No newline at end of file + - overlays/workflow-controller-configmap.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-deployment.yaml index d41ad079fb1..4334cd9d5b5 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /mysql name: mysql labels: app: mysql @@ -34,4 +34,4 @@ spec: initialDelaySeconds: 15 timeoutSeconds: 2 nodeSelector: - kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-service.yaml index 98be938e3f1..45a03a018d6 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/mysql-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /mysql name: mysql labels: app: mysql @@ -10,4 +10,4 @@ spec: ports: - protocol: TCP port: 3306 - targetPort: 3306 \ No newline at end of file + targetPort: 3306 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml index c20578d1482..31b15d50bdd 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml @@ -20,5 +20,5 @@ data: name: argo-mysql-config key: password kind: ConfigMap -metadata: - name: workflow-controller-configmap \ No newline at end of file +metadata: # kpt-merge: /workflow-controller-configmap + name: workflow-controller-configmap diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/argo-postgres-config-secret.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/argo-postgres-config-secret.yaml index 2a154b8c572..e14013fa585 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/argo-postgres-config-secret.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/argo-postgres-config-secret.yaml @@ -3,7 +3,7 @@ stringData: username: postgres password: password kind: Secret -metadata: +metadata: # kpt-merge: /argo-postgres-config name: argo-postgres-config labels: app: postgres diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/kustomization.yaml index b039183f45f..a70a0cc26b3 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/kustomization.yaml @@ -1,11 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base - argo-postgres-config-secret.yaml - postgres-deployment.yaml - postgres-service.yaml - patchesStrategicMerge: - - overlays/workflow-controller-configmap.yaml \ No newline at end of file + - overlays/workflow-controller-configmap.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml index 6675ce86e2d..28daa5b87e9 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml @@ -20,5 +20,5 @@ data: name: argo-postgres-config key: password kind: ConfigMap -metadata: - name: workflow-controller-configmap \ No newline at end of file +metadata: # kpt-merge: /workflow-controller-configmap + name: workflow-controller-configmap diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-deployment.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-deployment.yaml index c22a5009196..4f88e4040b8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-deployment.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-deployment.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /postgres name: postgres labels: app: postgres @@ -28,4 +28,4 @@ spec: initialDelaySeconds: 15 timeoutSeconds: 2 nodeSelector: - kubernetes.io/os: linux \ No newline at end of file + kubernetes.io/os: linux diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-service.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-service.yaml index e59ffa43721..b613893694e 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-service.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/postgres/postgres-service.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /postgres name: postgres labels: app: postgres @@ -10,4 +10,4 @@ spec: ports: - protocol: TCP port: 5432 - targetPort: 5432 \ No newline at end of file + targetPort: 5432 diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dev-svc.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dev-svc.yaml index 29e2f7c7d67..cd3697563b8 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dev-svc.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dev-svc.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: Service -metadata: +metadata: # kpt-merge: /dex name: dex spec: ports: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-cm.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-cm.yaml index c41c67cc595..45a1355fe91 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-cm.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-cm.yaml @@ -29,5 +29,5 @@ data: username: admin userID: 08a8684b-db88-4b73-90a9-3cd1661f5466 kind: ConfigMap -metadata: - name: dex \ No newline at end of file +metadata: # kpt-merge: /dex + name: dex diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-deploy.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-deploy.yaml index 5a622bb20b8..0f15abc600a 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-deploy.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-deploy.yaml @@ -1,6 +1,6 @@ apiVersion: apps/v1 kind: Deployment -metadata: +metadata: # kpt-merge: /dex labels: app: dex name: dex @@ -29,4 +29,4 @@ spec: volumes: - name: config configMap: - name: dex \ No newline at end of file + name: dex diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-rb.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-rb.yaml index 9a3f2788ce2..ce07b692e53 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-rb.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-rb.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -metadata: +metadata: # kpt-merge: /dex name: dex roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-role.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-role.yaml index ff1ab9aacd4..bb9a4fb94b1 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-role.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-role.yaml @@ -1,6 +1,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: +metadata: # kpt-merge: /dex name: dex rules: - apiGroups: diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-sa.yaml index 97a137459c0..561106c4ec4 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/dex-sa.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /dex name: dex diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml index 09b3bdbaca0..8ea85c17de0 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/dex/kustomization.yaml @@ -1,9 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - commonLabels: "app.kubernetes.io/part-of": "dex" - resources: - dex-cm.yaml - dex-role.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/kustomization.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/kustomization.yaml index 3981219ff0e..70aafea6549 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/kustomization.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/kustomization.yaml @@ -1,10 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - ../base - dex - patchesStrategicMerge: - overlays/workflow-controller-configmap.yaml - - overlays/argo-server-sa.yaml \ No newline at end of file + - overlays/argo-server-sa.yaml diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/argo-server-sa.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/argo-server-sa.yaml index 0cd3393f2a3..c09b7ac93d7 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/argo-server-sa.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/argo-server-sa.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /argo-server name: argo-server annotations: workflows.argoproj.io/rbac-rule: "'authors' in groups && email == 'kilgore@kilgore.trout'" diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml index b502c7f7c5e..1d7ff51133d 100644 --- a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml +++ b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/argo/upstream/manifests/quick-start/sso/overlays/workflow-controller-configmap.yaml @@ -15,5 +15,5 @@ data: rbac: enabled: true kind: ConfigMap -metadata: +metadata: # kpt-merge: /workflow-controller-configmap name: workflow-controller-configmap 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 be9b77b0fda..d826b83e814 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: +metadata: # kpt-merge: kubeflow/grafana 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. \ No newline at end of file + # TODO(jingzhang36): consider adding persistent volume if you would like the created dashboards to persist. 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 e06c9e9e6a0..c3a393958d6 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: +metadata: # kpt-merge: /grafana 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 c9f8b629439..088abb09afe 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: +metadata: # kpt-merge: /grafana 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 1ec8b08b8b2..62f2d59b0a0 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: +metadata: # kpt-merge: /grafana 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 ced9c388af3..f1d34483051 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: +metadata: # kpt-merge: /grafana 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 fd1cf026198..c6afe8deb7f 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 dc9c7324194..a8579cf8ec1 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: +metadata: # kpt-merge: /meta-controller-cluster-role-binding 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 0ae8700d789..e494439851b 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,7 +1,6 @@ ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /compositecontrollers.metacontroller.k8s.io name: compositecontrollers.metacontroller.k8s.io spec: group: metacontroller.k8s.io @@ -17,7 +16,7 @@ spec: --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /controllerrevisions.metacontroller.k8s.io name: controllerrevisions.metacontroller.k8s.io spec: group: metacontroller.k8s.io @@ -30,7 +29,7 @@ spec: --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition -metadata: +metadata: # kpt-merge: /decoratorcontrollers.metacontroller.k8s.io 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/service-account.yaml b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/third-party/metacontroller/base/service-account.yaml index 85c48de170e..6006dd3df8c 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: +metadata: # kpt-merge: /meta-controller-service 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 7bbc3870a8d..21cf6a44769 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: +metadata: # kpt-merge: /metacontroller labels: app: metacontroller name: metacontroller 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 e3b41d4cd8c..8997de3457e 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,6 +1,5 @@ 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 a1bd963078d..adc945cbd52 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: +metadata: # kpt-merge: /minio 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 ecfa32bbe8a..64a6a484d74 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: +metadata: # kpt-merge: /minio-pvc 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 3ab42043017..656d8ae70a8 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: +metadata: # kpt-merge: /minio-service 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 ac298d9b3d0..7d4544fa97b 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: +metadata: # kpt-merge: /mlpipeline-minio-artifact 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 7247cd34f96..10af61826fb 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: +metadata: # kpt-merge: /minio-service name: minio-service spec: action: ALLOW @@ -21,7 +21,7 @@ spec: --- apiVersion: "networking.istio.io/v1alpha3" kind: DestinationRule -metadata: +metadata: # kpt-merge: /ml-pipeline-minio 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 611e399e57c..dc764d7738d 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,5 +1,4 @@ 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 df8929c1966..eae62ccc8cd 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,6 +1,5 @@ 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 c7174d44b44..6d4ef61689d 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: +metadata: # kpt-merge: /mysql 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 108dc24ef32..eac8bb57f31 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: +metadata: # kpt-merge: /mysql-pv-claim 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 d52482770e7..61afaad3559 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: +metadata: # kpt-merge: /mysql 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 f9a2ab7d4d0..152242e191c 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,5 +1,4 @@ apiVersion: v1 kind: ServiceAccount -metadata: +metadata: # kpt-merge: /mysql 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 a8dcb205c92..8b0e2eb062c 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: +metadata: # kpt-merge: kubeflow/mysql name: mysql namespace: kubeflow spec: @@ -18,12 +18,10 @@ 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: +metadata: # kpt-merge: /ml-pipeline-mysql 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 611e399e57c..dc764d7738d 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,5 +1,4 @@ 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 9b2d54ef6e0..7fab6008e8e 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 6bb19ccdfbf..9a9da55a3ee 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: - name: prometheus-configmap \ No newline at end of file +metadata: # kpt-merge: /prometheus-configmap + name: prometheus-configmap 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 ebd4f8aebb9..aa09af8ce8e 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: +metadata: # kpt-merge: /prometheus name: prometheus labels: app: prometheus @@ -18,17 +18,15 @@ 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 4cb03fc19e7..9bc4d6dbe55 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: +metadata: # kpt-merge: /prometheus 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 12a56ee13d1..ad2133bdfb9 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: +metadata: # kpt-merge: /prometheus 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 f3fb283ca03..1ff59c55b65 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: +metadata: # kpt-merge: /prometheus 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 7071bb7a910..c9e522593e8 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: +metadata: # kpt-merge: /prometheus labels: app: prometheus name: prometheus