test(kfp): Upgrade to 2.0.0-alpha.0 (kubeflow#995)

Linchin · Mar 16, 2022 · abd5b89 · abd5b89
1 parent 98e0563
commit abd5b89
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 36 deletions.
diff --git a/acm-repos/kfp-standalone-1/kfp-all.yaml b/acm-repos/kfp-standalone-1/kfp-all.yaml
@@ -1828,7 +1828,7 @@ apiVersion: v1
 data:
   ConMaxLifeTime: 120s
   appName: kfp-standalone-1
-  appVersion: 1.8.1
+  appVersion: 2.0.0-alpha.0
   autoUpdatePipelineDefaultVersion: "true"
   bucketName: mlpipeline
   cacheDb: cachedb
@@ -2174,7 +2174,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/cache-deployer:1.8.1
+        image: gcr.io/ml-pipeline/cache-deployer:2.0.0-alpha.0
         imagePullPolicy: Always
         name: main
       restartPolicy: Always
@@ -2251,7 +2251,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/cache-server:1.8.1
+        image: gcr.io/ml-pipeline/cache-server:2.0.0-alpha.0
         imagePullPolicy: Always
         name: server
         ports:
@@ -2336,7 +2336,7 @@ spec:
         component: metadata-envoy
     spec:
       containers:
-      - image: gcr.io/ml-pipeline/metadata-envoy:1.8.1
+      - image: gcr.io/ml-pipeline/metadata-envoy:2.0.0-alpha.0
         name: container
         ports:
         - containerPort: 9090
@@ -2446,7 +2446,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/metadata-writer:1.8.1
+        image: gcr.io/ml-pipeline/metadata-writer:2.0.0-alpha.0
         name: main
       serviceAccountName: kubeflow-pipelines-metadata-writer
 ---
@@ -2582,7 +2582,7 @@ spec:
             secretKeyRef:
               key: secretkey
               name: mlpipeline-minio-artifact
-        image: gcr.io/ml-pipeline/api-server:1.8.1
+        image: gcr.io/ml-pipeline/api-server:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -2651,7 +2651,7 @@ spec:
           value: "86400"
         - name: NUM_WORKERS
           value: "2"
-        image: gcr.io/ml-pipeline/persistenceagent:1.8.1
+        image: gcr.io/ml-pipeline/persistenceagent:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         name: ml-pipeline-persistenceagent
         resources:
@@ -2692,7 +2692,7 @@ spec:
             configMapKeyRef:
               key: cronScheduleTimezone
               name: pipeline-install-config
-        image: gcr.io/ml-pipeline/scheduledworkflow:1.8.1
+        image: gcr.io/ml-pipeline/scheduledworkflow:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         name: ml-pipeline-scheduledworkflow
       serviceAccountName: ml-pipeline-scheduledworkflow
@@ -2738,7 +2738,7 @@ spec:
               name: mlpipeline-minio-artifact
         - name: ALLOW_CUSTOM_VISUALIZATIONS
           value: "true"
-        image: gcr.io/ml-pipeline/frontend:1.8.1
+        image: gcr.io/ml-pipeline/frontend:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -2810,7 +2810,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: gcr.io/ml-pipeline/viewer-crd-controller:1.8.1
+        image: gcr.io/ml-pipeline/viewer-crd-controller:2.0.0-alpha.0
         imagePullPolicy: Always
         name: ml-pipeline-viewer-crd
       serviceAccountName: ml-pipeline-viewer-crd-service-account
@@ -2837,7 +2837,7 @@ spec:
         application-crd-id: kubeflow-pipelines
     spec:
       containers:
-      - image: gcr.io/ml-pipeline/visualization-server:1.8.1
+      - image: gcr.io/ml-pipeline/visualization-server:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -2945,7 +2945,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.8.1
+        image: gcr.io/ml-pipeline/inverse-proxy-agent:2.0.0-alpha.0
         imagePullPolicy: IfNotPresent
         name: proxy-agent
       hostNetwork: true
@@ -3058,7 +3058,7 @@ spec:
       url: https://github.com/kubeflow/pipelines
     notes: Please go to [Hosted Kubeflow Pipelines Console](https://console.cloud.google.com/ai-platform/pipelines/clusters).
     type: Kubeflow Pipelines
-    version: 1.8.1
+    version: 2.0.0-alpha.0
   info:
   - name: Console
     value: https://console.cloud.google.com/ai-platform/pipelines/clusters

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

diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/Kptfile
@@ -7,12 +7,12 @@ upstream:
   git:
     repo: https://github.com/kubeflow/pipelines
     directory: /manifests/kustomize
-    ref: 1.8.1
+    ref: 2.0.0-alpha.0
   updateStrategy: resource-merge
 upstreamLock:
   type: git
   git:
     repo: https://github.com/kubeflow/pipelines
     directory: /manifests/kustomize
-    ref: 1.8.1
-    commit: 04b401258ddf87fc65684c3f4cac78e7e071f9ff
+    ref: 2.0.0-alpha.0
+    commit: b81939e5cfa020f0c93fe0f0df61dba87425681b
diff --git a/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS b/test-infra/kfp/kfp-standalone-1/kustomize/upstream/OWNERS
@@ -1,5 +1,4 @@
 approvers:
   - zijianjoy
 reviewers:
-  - Bobgy
   - zijianjoy
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: 1.8.1
+    newTag: 2.0.0-alpha.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: 1.8.1
+    newTag: 2.0.0-alpha.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
@@ -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 <your-namespace>`.
   appName: pipeline
-  appVersion: 1.8.1
+  appVersion: 2.0.0-alpha.0
   dbHost: mysql
   dbPort: "3306"
   mlmdDb: metadb

diff --git a/...dalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/sync.py b/...dalone-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/sync.py
@@ -93,7 +93,7 @@ def get_settings_from_env(controller_port=None,
 def server_factory(visualization_server_image,
                    visualization_server_tag, frontend_image, frontend_tag,
                    disable_istio_sidecar, minio_access_key,
-                   minio_secret_key, kfp_default_pipeline_root=None, 
+                   minio_secret_key, kfp_default_pipeline_root=None,
                    url="", controller_port=8080):
     """
     Returns an HTTPServer populated with Handler with customized settings
@@ -360,8 +360,8 @@ def sync(self, parent, children):
                     }
                 },
             ]
-            print('Received request:\n', json.dumps(parent, indent=2, sort_keys=True))
-            print('Desired resources except secrets:\n', json.dumps(desired_resources, indent=2, sort_keys=True))
+            print('Received request:\n', json.dumps(parent, sort_keys=True))
+            print('Desired resources except secrets:\n', json.dumps(desired_resources, sort_keys=True))
             # Moved after the print argument because this is sensitive data.
             desired_resources.append({
                 "apiVersion": "v1",

diff --git a/...e-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/test_sync.py b/...e-1/kustomize/upstream/base/installs/multi-user/pipelines-profile-controller/test_sync.py
@@ -202,7 +202,7 @@ def test_sync_server_with_pipeline_enabled(sync_server, data, expected_status,
     url = f"http://{server.server_address[0]}:{str(server.server_address[1])}"
     print("url: ", url)
     print("data")
-    print(json.dumps(data, indent=2))
+    print(json.dumps(data))
     x = requests.post(url, data=json.dumps(data))
     results = json.loads(x.text)
 
@@ -245,7 +245,7 @@ def test_sync_server_with_direct_passing_of_settings(
     url = f"http://{server.server_address[0]}:{str(server.server_address[1])}"
     print("url: ", url)
     print("data")
-    print(json.dumps(data, indent=2))
+    print(json.dumps(data))
     x = requests.post(url, data=json.dumps(data))
     results = json.loads(x.text)
 
@@ -271,7 +271,7 @@ def test_sync_server_without_pipeline_enabled(sync_server, data, expected_status
     """
     Nearly end-to-end test of how Controller serves .sync as a POST
 
-    Tests case where metadata.labels.pipelines.kubeflow.org/enabled does not 
+    Tests case where metadata.labels.pipelines.kubeflow.org/enabled does not
     exist and thus server returns an empty reply
     """
     server, environ = sync_server

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: 1.8.1
+    newTag: 2.0.0-alpha.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: 1.8.1
+    newTag: 2.0.0-alpha.0
   - name: gcr.io/ml-pipeline/persistenceagent
-    newTag: 1.8.1
+    newTag: 2.0.0-alpha.0
   - name: gcr.io/ml-pipeline/scheduledworkflow
-    newTag: 1.8.1
+    newTag: 2.0.0-alpha.0
   - name: gcr.io/ml-pipeline/frontend
-    newTag: 1.8.1
+    newTag: 2.0.0-alpha.0
   - name: gcr.io/ml-pipeline/viewer-crd-controller
-    newTag: 1.8.1
+    newTag: 2.0.0-alpha.0
   - name: gcr.io/ml-pipeline/visualization-server
-    newTag: 1.8.1
+    newTag: 2.0.0-alpha.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: 1.8.1
+    newTag: 2.0.0-alpha.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: 1.8.1
+    newTag: 2.0.0-alpha.0
 resources:
   - proxy-configmap.yaml
   - proxy-deployment.yaml