Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Testing] Use google/cloud-sdk:279.0.0 to resolve workload identity flakiness #3019

Merged
merged 15 commits into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/diagnostics/diagnose_me/component.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def run_diagnose_me(
HALT_ON_ERROR flag is set.
"""

# Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0'
# Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0'
# does not come with pip3 pre-installed.
import subprocess
subprocess.run(
Expand Down Expand Up @@ -157,6 +157,6 @@ def run_diagnose_me(

comp.func_to_container_op(
run_diagnose_me,
base_image='google/cloud-sdk:276.0.0',
base_image='google/cloud-sdk:279.0.0',
output_component_file='component.yaml',
)
6 changes: 3 additions & 3 deletions components/diagnostics/diagnose_me/component.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ implementation:
HALT_ON_ERROR flag is set.
"""

# Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0'
# Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0'
# does not come with pip3 pre-installed.
import subprocess
subprocess.run(
Expand Down Expand Up @@ -193,7 +193,7 @@ implementation:
- '----output-paths'
- {outputPath: bucket}
- {outputPath: project_id}
image: google/cloud-sdk:276.0.0
image: google/cloud-sdk:279.0.0
description: |-
Performs environment verification specific to this pipeline.

Expand All @@ -215,4 +215,4 @@ inputs:
- {name: bucket, type: String}
- {name: execution_mode, type: String}
- {name: project_id, type: String}
- {name: target_apis, type: String}
- {name: target_apis, type: String}
2 changes: 1 addition & 1 deletion samples/core/exit_handler/exit_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def gcs_download_op(url):
return dsl.ContainerOp(
name='GCS - Download',
image='google/cloud-sdk:272.0.0',
image='google/cloud-sdk:279.0.0',
command=['sh', '-c'],
arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'],
file_outputs={
Expand Down
16 changes: 8 additions & 8 deletions samples/core/kfp_env_validation/kfp_env_validation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
" RuntimeError: If gcp credentials are not configured correctly\n",
" \"\"\"\n",
" \n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n",
" import subprocess\n",
" subprocess.run(\n",
" ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n",
Expand Down Expand Up @@ -86,7 +86,7 @@
" RuntimeError: If gcp credentials are not configured correctly\n",
" \"\"\"\n",
"\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n",
" import subprocess\n",
" subprocess.run(\n",
" ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n",
Expand Down Expand Up @@ -141,7 +141,7 @@
" RuntimeError: If gcp credentials are not configured correctly\n",
" \"\"\"\n",
"\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n",
" import subprocess\n",
" subprocess.run(\n",
" ['curl', 'https://bootstrap.pypa.io/get-pip.py', '-o', 'get-pip.py'],\n",
Expand Down Expand Up @@ -214,7 +214,7 @@
" have proper privilege to access the API status. \n",
" \"\"\"\n",
" \n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:276.0.0' does not come with pip3 pre-installed.\n",
" # Installing pip3 and kfp, since the base image 'google/cloud-sdk:279.0.0' does not come with pip3 pre-installed.\n",
" import subprocess\n",
" subprocess.run(['curl','https://bootstrap.pypa.io/get-pip.py','-o','get-pip.py'], capture_output=True)\n",
" subprocess.run(['apt-get', 'install', 'python3-distutils','--yes'], capture_output=True)\n",
Expand Down Expand Up @@ -274,17 +274,17 @@
"import kfp.components as comp\n",
"\n",
"run_diagnose_me_op = comp.func_to_container_op(\n",
" run_diagnose_me, base_image='google/cloud-sdk:276.0.0')\n",
" run_diagnose_me, base_image='google/cloud-sdk:279.0.0')\n",
"\n",
"verify_gcp_credentials_op = comp.func_to_container_op(\n",
" verify_gcp_credentials, base_image='google/cloud-sdk:276.0.0')\n",
" verify_gcp_credentials, base_image='google/cloud-sdk:279.0.0')\n",
"\n",
"print_scopes_op = comp.func_to_container_op(\n",
" print_scopes, base_image='google/cloud-sdk:276.0.0')\n",
" print_scopes, base_image='google/cloud-sdk:279.0.0')\n",
"\n",
"\n",
"verify_gcp_apis_op = comp.func_to_container_op(\n",
" verfiy_gcp_apis, base_image='google/cloud-sdk:276.0.0')"
" verfiy_gcp_apis, base_image='google/cloud-sdk:279.0.0')"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion samples/core/parallel_join/parallel_join.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
def gcs_download_op(url):
return dsl.ContainerOp(
name='GCS - Download',
image='google/cloud-sdk:272.0.0',
image='google/cloud-sdk:279.0.0',
command=['sh', '-c'],
arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'],
file_outputs={
Expand Down
8 changes: 4 additions & 4 deletions samples/core/secret/secret.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def gcs_read_op(url):
return dsl.ContainerOp(
name='Access GCS using auth token',
image='google/cloud-sdk:272.0.0',
image='google/cloud-sdk:279.0.0',
command=['sh', '-c'],
arguments=[
'gsutil ls "$0" && echo "$1"',
Expand All @@ -34,11 +34,11 @@ def gcs_read_op(url):
def use_gcp_api_op():
return dsl.ContainerOp(
name='Using Google Cloud APIs with Auth',
image='google/cloud-sdk:272.0.0',
image='google/cloud-sdk:279.0.0',
command=[
'sh', '-c',
'pip install google-cloud-storage && "$0" "$*"',
'python', '-c', '''
'pip3 install google-cloud-storage && "$0" "$*"',
'python3', '-c', '''
from google.cloud import storage
storage_client = storage.Client()
buckets = storage_client.list_buckets()
Expand Down
2 changes: 1 addition & 1 deletion samples/core/sequential/sequential.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def gcs_download_op(url):
return dsl.ContainerOp(
name='GCS - Download',
image='google/cloud-sdk:272.0.0',
image='google/cloud-sdk:279.0.0',
command=['sh', '-c'],
arguments=['gsutil cat $0 | tee $1', url, '/tmp/results.txt'],
file_outputs={
Expand Down
2 changes: 1 addition & 1 deletion samples/core/volume_snapshot_ops/volume_snapshot_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def volume_snapshotop_sequential(url):

step1 = dsl.ContainerOp(
name="step1_ingest",
image="google/cloud-sdk:272.0.0",
image="google/cloud-sdk:279.0.0",
command=["sh", "-c"],
arguments=["mkdir /data/step1 && "
"gsutil cat %s | gzip -c >/data/step1/file1.gz" % url],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def volume_snapshotop_sequential(url):

step1 = dsl.ContainerOp(
name="step1_ingest",
image="google/cloud-sdk:272.0.0",
image="google/cloud-sdk:279.0.0",
command=["sh", "-c"],
arguments=["mkdir /data/step1 && "
"gsutil cat %s | gzip -c >/data/step1/file1.gz" % url],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
command:
- sh
- -c
image: google/cloud-sdk:272.0.0
image: google/cloud-sdk:279.0.0
volumeMounts:
- mountPath: /data
name: create-volume
Expand Down
2 changes: 1 addition & 1 deletion test/build_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
parameters:
- name: image-build-context-gcs-uri
- name: image-builder-image
value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c
value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961
- name: api-image
- name: frontend-image
- name: scheduledworkflow-image
Expand Down
2 changes: 1 addition & 1 deletion test/component_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
parameters:
- name: image-build-context-gcs-uri
- name: image-builder-image
value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c
value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961
- name: commit-sha
- name: component-image-prefix
- name: target-image-prefix
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_test_gke_v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
parameters:
- name: image-build-context-gcs-uri
- name: image-builder-image
value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c
value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961
- name: target-image-prefix
- name: test-results-gcs-dir
- name: initialization-test-image-suffix
Expand Down
2 changes: 1 addition & 1 deletion test/frontend-integration-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/ml-pipeline-test/selenium-standalone-chrome-gcloud-nodejs:v20190618-0.1.21-79-g2d40ae68-dirty-9d8d84
FROM gcr.io/ml-pipeline-test/selenium-standalone-chrome-gcloud-nodejs:v20200210-0.2.2-30-g05865480-e3b0c4
#To build this image: cd selenium-standalone-chrome-gcloud-nodejs.Docker && make push

COPY --chown=seluser . /src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM selenium/standalone-chrome:3.141.59-oxygen

USER root

ARG CLOUD_SDK_VERSION=244.0.0
ARG CLOUD_SDK_VERSION=279.0.0
ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION

ARG INSTALL_COMPONENTS=kubectl
Expand Down
2 changes: 1 addition & 1 deletion test/imagebuilder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This image contains script to pull github code, build image and push to gcr
# Available at gcr.io/ml-pipeline/image-builder

FROM google/cloud-sdk
FROM google/cloud-sdk:279.0.0

COPY ./build.sh /build.sh
RUN chmod +x /build.sh
Expand Down
2 changes: 1 addition & 1 deletion test/presubmit-tests-with-pipeline-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ PROJECT=ml-pipeline-test
TEST_RESULT_BUCKET=ml-pipeline-test
TIMEOUT_SECONDS=2700 # 45 minutes
NAMESPACE=kubeflow
ENABLE_WORKLOAD_IDENTITY=false
ENABLE_WORKLOAD_IDENTITY=true

while [ "$1" != "" ]; do
case $1 in
Expand Down
2 changes: 1 addition & 1 deletion test/sample-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This image has the script to kick off the ML pipeline sample e2e test,

FROM google/cloud-sdk:272.0.0
FROM google/cloud-sdk:279.0.0

RUN apt-get update -y
RUN apt-get install --no-install-recommends -y -q libssl-dev libffi-dev wget ssh
Expand Down
2 changes: 1 addition & 1 deletion test/sample-test/configs/xgboost_training_cm.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ arguments:
schema: gs://ml-pipeline-dataset/sample-test/sfpd/schema.json
rounds: 5
workers: 2
test_timeout: 1800 # xgboost needs extra time.
test_timeout: 3600 # xgboost needs extra time, 60 * 60 secs
2 changes: 1 addition & 1 deletion test/sample_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
parameters:
- name: image-build-context-gcs-uri
- name: image-builder-image
value: gcr.io/ml-pipeline-test/image-builder:v20191122-0.1.25-582-g7908980c
value: gcr.io/ml-pipeline-test/image-builder:v20200208-0.1.25-771-g4c571961
- name: target-image-prefix
- name: test-results-gcs-dir
- name: sample-tests-image-suffix
Expand Down