Update kfp test infra to using kfp 2.0 (#1031)

kubeflow · Jun 20, 2023 · 9f52957 · 9f52957
1 parent 7977d47
commit 9f52957
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/acm-repos/kfp-standalone-1/kfp-all.yaml b/acm-repos/kfp-standalone-1/kfp-all.yaml
@@ -2399,7 +2399,7 @@ data:
   DEFAULT_CACHE_STALENESS: ""
   MAXIMUM_CACHE_STALENESS: ""
   appName: kfp-standalone-1
-  appVersion: 2.0.0-rc.2
+  appVersion: 2.0.0
   autoUpdatePipelineDefaultVersion: "true"
   bucketName: mlpipeline
   cacheDb: cachedb
@@ -2785,7 +2785,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/cache-deployer:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/cache-deployer:2.0.0
         imagePullPolicy: Always
         name: main
       restartPolicy: Always
@@ -2877,7 +2877,7 @@ spec:
               fieldPath: metadata.namespace
         - name: WEBHOOK_PORT
           value: "8443"
-        image: gcr.io/ml-pipeline/cache-server:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/cache-server:2.0.0
         imagePullPolicy: Always
         name: server
         ports:
@@ -2966,7 +2966,7 @@ spec:
         component: metadata-envoy
     spec:
       containers:
-      - image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-rc.2
+      - image: gcr.io/ml-pipeline/metadata-envoy:2.0.0
         name: container
         ports:
         - containerPort: 9090
@@ -3083,7 +3083,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/metadata-writer:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/metadata-writer:2.0.0
         name: main
         resources:
           limits:
@@ -3226,7 +3226,7 @@ spec:
             secretKeyRef:
               key: secretkey
               name: mlpipeline-minio-artifact
-        image: gcr.io/ml-pipeline/api-server:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/api-server:2.0.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -3313,7 +3313,7 @@ spec:
           value: kubeflow-userid
         - name: KUBEFLOW_USERID_PREFIX
           value: ""
-        image: gcr.io/ml-pipeline/persistenceagent:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/persistenceagent:2.0.0
         imagePullPolicy: IfNotPresent
         name: ml-pipeline-persistenceagent
         resources:
@@ -3356,7 +3356,7 @@ spec:
             configMapKeyRef:
               key: cronScheduleTimezone
               name: pipeline-install-config
-        image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0
         imagePullPolicy: IfNotPresent
         name: ml-pipeline-scheduledworkflow
       serviceAccountName: ml-pipeline-scheduledworkflow
@@ -3404,7 +3404,7 @@ spec:
               name: mlpipeline-minio-artifact
         - name: ALLOW_CUSTOM_VISUALIZATIONS
           value: "true"
-        image: gcr.io/ml-pipeline/frontend:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/frontend:2.0.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -3478,7 +3478,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0
         imagePullPolicy: Always
         name: ml-pipeline-viewer-crd
       serviceAccountName: ml-pipeline-viewer-crd-service-account
@@ -3507,7 +3507,7 @@ spec:
         application-crd-id: kubeflow-pipelines
     spec:
       containers:
-      - image: gcr.io/ml-pipeline/visualization-server:2.0.0-rc.2
+      - image: gcr.io/ml-pipeline/visualization-server:2.0.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -3620,7 +3620,7 @@ spec:
       - env:
         - name: PROXY_URL
           value: https://datalab-staging.cloud.google.com/tun/m/4592f092208ecc84946b8f8f8016274df1b36a14
-        image: gcr.io/ml-pipeline/inverse-proxy-agent:2.0.0-rc.2
+        image: gcr.io/ml-pipeline/inverse-proxy-agent:2.0.0
         imagePullPolicy: IfNotPresent
         name: proxy-agent
       hostNetwork: true
@@ -3737,7 +3737,7 @@ spec:
       url: https://github.com/kubeflow/pipelines
     notes: Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters).
     type: Kubeflow Pipelines
-    version: 2.0.0-rc.2
+    version: 2.0.0
   info:
   - name: Console
     value: https://console.cloud.google.com/ai-platform/pipelines/clusters

diff --git a/test-infra/kfp/Makefile b/test-infra/kfp/Makefile
@@ -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?=2.0.0-rc.2
+PIPELINES_VERSION?=2.0.0
 PIPELINES_SRC_REPO=https://github.com/kubeflow/pipelines.git
 
 all: hydrate hydrate-kfp-manifests vet-kfp-manifests

diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile
@@ -7,12 +7,12 @@ upstream:
   git:
     repo: https://github.com/kubeflow/pipelines
     directory: /manifests/kustomize
-    ref: 2.0.0-rc.2
+    ref: 2.0.0
   updateStrategy: resource-merge
 upstreamLock:
   type: git
   git:
     repo: https://github.com/kubeflow/pipelines
     directory: /manifests/kustomize
-    ref: 2.0.0-rc.2
-    commit: 6bf693dd8b9f6aa7b7d804dc427b15646b904807
+    ref: 2.0.0
+    commit: 1500188da71c388da568e9e98f27f549d9dce955
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
@@ -8,4 +8,4 @@ commonLabels:
   app: cache-deployer
 images:
   - name: gcr.io/ml-pipeline/cache-deployer
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
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
@@ -10,4 +10,4 @@ commonLabels:
   app: cache-server
 images:
   - name: gcr.io/ml-pipeline/cache-server
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
diff --git a/...fp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml b/...fp/kfp-standalone-1/kustomize/upstream/base/installs/generic/pipeline-install-config.yaml
@@ -13,7 +13,7 @@ data:
     until the changes take effect. A quick way to restart all deployments in a
     namespace: `kubectl rollout restart deployment -n <your-namespace>`.
   appName: pipeline
-  appVersion: 2.0.0-rc.2
+  appVersion: 2.0.0
   dbHost: mysql
   dbPort: "3306"
   mlmdDb: metadb

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
@@ -9,4 +9,4 @@ resources:
   - metadata-grpc-sa.yaml
 images:
   - name: gcr.io/ml-pipeline/metadata-envoy
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
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
@@ -37,14 +37,14 @@ resources:
   - kfp-launcher-configmap.yaml
 images:
   - name: gcr.io/ml-pipeline/api-server
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
   - name: gcr.io/ml-pipeline/persistenceagent
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
   - name: gcr.io/ml-pipeline/scheduledworkflow
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
   - name: gcr.io/ml-pipeline/frontend
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
   - name: gcr.io/ml-pipeline/viewer-crd-controller
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
   - name: gcr.io/ml-pipeline/visualization-server
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
diff --git a/.../kfp/kfp-standalone-1/kustomize/upstream/base/pipeline/metadata-writer/kustomization.yaml b/.../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: 2.0.0-rc.2
+    newTag: 2.0.0
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
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
   - name: gcr.io/ml-pipeline/inverse-proxy-agent
-    newTag: 2.0.0-rc.2
+    newTag: 2.0.0
 resources:
   - proxy-configmap.yaml
   - proxy-deployment.yaml