From f5d1e8ffb5312ef98013c350706fd1bfafa056c9 Mon Sep 17 00:00:00 2001 From: Patti Shin Date: Thu, 22 Feb 2024 21:33:32 -0500 Subject: [PATCH 01/11] fix(issue-230): adding in startupProb to sidecar (#234) * fix: adding in startupProb to sidecar * test: added debug log * test: leave run container to debug * refactor: updating limit to 2 with addition with startup probe, additional log displays before actual expected service * refactor: clean up --- multi-container/hello-nginx-sample/service.yaml | 6 ++++++ multi-container/hello-nginx-sample/tests/e2e-test.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/multi-container/hello-nginx-sample/service.yaml b/multi-container/hello-nginx-sample/service.yaml index ca2d41f2..5a66f7b7 100644 --- a/multi-container/hello-nginx-sample/service.yaml +++ b/multi-container/hello-nginx-sample/service.yaml @@ -80,6 +80,12 @@ spec: limits: cpu: 1000m memory: 512Mi + startupProbe: + timeoutSeconds: 240 + periodSeconds: 240 + failureThreshold: 1 + tcpSocket: + port: 8888 # [END cloudrun_mc_hello_sidecar_step_sidecar] # Named volume pointing to # nginx_config secret in secret manager diff --git a/multi-container/hello-nginx-sample/tests/e2e-test.sh b/multi-container/hello-nginx-sample/tests/e2e-test.sh index a297b2d5..b9ca80c5 100755 --- a/multi-container/hello-nginx-sample/tests/e2e-test.sh +++ b/multi-container/hello-nginx-sample/tests/e2e-test.sh @@ -40,7 +40,7 @@ then fi # Check Cloud Run MC logs for signs of successful request to hello container. -MC_HELLO_LOG=$(gcloud logging read "resource.type=cloud_run_revision AND resource.labels.service_name=${MC_SERVICE_NAME} AND labels.container_name=hello" --limit 1 | grep -e 'Hello from Cloud Run') +MC_HELLO_LOG=$(gcloud logging read "resource.type=cloud_run_revision AND resource.labels.service_name=${MC_SERVICE_NAME} AND labels.container_name=hello" --limit 2 | grep -e 'Hello from Cloud Run') if [[ -z "${MC_HELLO_LOG}" ]] then From bbad4684f27b82a57db33b417d899db4dcb4ef24 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 14 Mar 2024 23:30:35 +0100 Subject: [PATCH 02/11] chore(deps): update dependency google-auth to v2.28.2 (#235) --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index 54c8b889..206fd891 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ -google-auth==2.28.1 +google-auth==2.28.2 requests==2.31.0 functions-framework==3.5.0 \ No newline at end of file From 4c44085fa73b4dcc0fe7117b07686d1789e760bd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 18 Mar 2024 01:56:09 +0100 Subject: [PATCH 03/11] chore(deps): update alpine docker tag to v20240315 (#236) --- testing/cloudbuild-templates/Dockerfile | 2 +- testing/test-cases/module.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/cloudbuild-templates/Dockerfile b/testing/cloudbuild-templates/Dockerfile index eaaa6818..28e2b934 100644 --- a/testing/cloudbuild-templates/Dockerfile +++ b/testing/cloudbuild-templates/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile provides a self-contained "Hello, World!" service. # It is used to facilitate troubleshooting the Cloud Build templates. -FROM alpine:20231219 +FROM alpine:20240315 CMD while :; do nc -l -p $PORT -e sh -c 'echo -e "HTTP/1.1 200 OK\n\n Hello, World!"'; done \ No newline at end of file diff --git a/testing/test-cases/module.Dockerfile b/testing/test-cases/module.Dockerfile index 2d0df792..51f75b97 100644 --- a/testing/test-cases/module.Dockerfile +++ b/testing/test-cases/module.Dockerfile @@ -23,7 +23,7 @@ COPY . ./ RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -v -o server -FROM alpine:20231219 +FROM alpine:20240315 RUN apk add --no-cache ca-certificates COPY --from=builder /app/server /server From 94f9610c743b70563615a2ddb205ef5286694e0b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 10 May 2024 00:27:54 +0200 Subject: [PATCH 04/11] chore(deps): update dependency google-auth to v2.29.0 (#237) --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index 206fd891..827c0a83 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ -google-auth==2.28.2 +google-auth==2.29.0 requests==2.31.0 functions-framework==3.5.0 \ No newline at end of file From 59cf618537616e12237e22fe4ef24fb6fb0058fc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 10 May 2024 00:39:16 +0200 Subject: [PATCH 05/11] chore(deps): update alpine docker tag to v20240329 (#238) Co-authored-by: Katie McLaughlin --- testing/cloudbuild-templates/Dockerfile | 2 +- testing/test-cases/module.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/cloudbuild-templates/Dockerfile b/testing/cloudbuild-templates/Dockerfile index 28e2b934..0cf0c840 100644 --- a/testing/cloudbuild-templates/Dockerfile +++ b/testing/cloudbuild-templates/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile provides a self-contained "Hello, World!" service. # It is used to facilitate troubleshooting the Cloud Build templates. -FROM alpine:20240315 +FROM alpine:20240329 CMD while :; do nc -l -p $PORT -e sh -c 'echo -e "HTTP/1.1 200 OK\n\n Hello, World!"'; done \ No newline at end of file diff --git a/testing/test-cases/module.Dockerfile b/testing/test-cases/module.Dockerfile index 51f75b97..7bfc06fc 100644 --- a/testing/test-cases/module.Dockerfile +++ b/testing/test-cases/module.Dockerfile @@ -23,7 +23,7 @@ COPY . ./ RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -v -o server -FROM alpine:20240315 +FROM alpine:20240329 RUN apk add --no-cache ca-certificates COPY --from=builder /app/server /server From 1828f93e57916be110b5a6bc4c6fa071d2b1d138 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 10 May 2024 00:52:42 +0200 Subject: [PATCH 06/11] chore(deps): update ubuntu docker tag to v24 (#239) Co-authored-by: Katie McLaughlin --- jobs-shell/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs-shell/Dockerfile b/jobs-shell/Dockerfile index 785f6726..2fa85dac 100644 --- a/jobs-shell/Dockerfile +++ b/jobs-shell/Dockerfile @@ -16,7 +16,7 @@ # Use the official Ubuntu image from Docker Hub as # a base image -FROM ubuntu:22.04 +FROM ubuntu:24.04 # Execute next commands in the directory /workspace WORKDIR /workspace From e388445cf3a74120865e2ca033711e35b01c0cad Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 24 May 2024 00:06:50 +0200 Subject: [PATCH 07/11] chore(deps): update dependency functions-framework to v3.7.0 (#244) --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index 827c0a83..b73d1325 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ google-auth==2.29.0 requests==2.31.0 -functions-framework==3.5.0 \ No newline at end of file +functions-framework==3.7.0 \ No newline at end of file From e553c70cd26e4f30952e40067c14dff298b9d5c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 11:12:10 +1000 Subject: [PATCH 08/11] chore(deps): bump requests from 2.31.0 to 2.32.2 in /vpc-sample (#245) Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index b73d1325..ed414d38 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ google-auth==2.29.0 -requests==2.31.0 +requests==2.32.2 functions-framework==3.7.0 \ No newline at end of file From 9182b587c32d7513098b0573ea4ddaa4e2851ec9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 19 Jun 2024 06:06:08 +0200 Subject: [PATCH 09/11] chore(deps): update dependency requests to v2.32.3 (#246) --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index ed414d38..768e4306 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ google-auth==2.29.0 -requests==2.32.2 +requests==2.32.3 functions-framework==3.7.0 \ No newline at end of file From 940e6c66d29407bc9366bef3f9097e0fd2f08ac4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 19 Jun 2024 06:55:19 +0200 Subject: [PATCH 10/11] chore(deps): update dependency google-auth to v2.30.0 (#247) --- vpc-sample/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt index 768e4306..8c066e2c 100644 --- a/vpc-sample/requirements.txt +++ b/vpc-sample/requirements.txt @@ -1,3 +1,3 @@ -google-auth==2.29.0 +google-auth==2.30.0 requests==2.32.3 functions-framework==3.7.0 \ No newline at end of file From 1312a17937c47ad1c1133606c7008c0f3de22ab7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 19 Jun 2024 07:07:00 +0200 Subject: [PATCH 11/11] chore(deps): update alpine docker tag to v20240606 (#248) Co-authored-by: Katie McLaughlin --- testing/cloudbuild-templates/Dockerfile | 2 +- testing/test-cases/module.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/cloudbuild-templates/Dockerfile b/testing/cloudbuild-templates/Dockerfile index 0cf0c840..3100a006 100644 --- a/testing/cloudbuild-templates/Dockerfile +++ b/testing/cloudbuild-templates/Dockerfile @@ -1,5 +1,5 @@ # This Dockerfile provides a self-contained "Hello, World!" service. # It is used to facilitate troubleshooting the Cloud Build templates. -FROM alpine:20240329 +FROM alpine:20240606 CMD while :; do nc -l -p $PORT -e sh -c 'echo -e "HTTP/1.1 200 OK\n\n Hello, World!"'; done \ No newline at end of file diff --git a/testing/test-cases/module.Dockerfile b/testing/test-cases/module.Dockerfile index 7bfc06fc..18b33d62 100644 --- a/testing/test-cases/module.Dockerfile +++ b/testing/test-cases/module.Dockerfile @@ -23,7 +23,7 @@ COPY . ./ RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -v -o server -FROM alpine:20240329 +FROM alpine:20240606 RUN apk add --no-cache ca-certificates COPY --from=builder /app/server /server