Merge branch 'main' into feature/opa-cloudrun-example

GoogleCloudPlatform · Jun 19, 2024 · af83ee9 · af83ee9
2 parents b843eec + 1312a17
commit af83ee9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git 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

diff --git 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
@@ -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

diff --git 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:20240606
 
 CMD while :; do nc -l -p $PORT -e sh -c 'echo -e "HTTP/1.1 200 OK\n\n Hello, World!"'; done
diff --git 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:20240606
 RUN apk add --no-cache ca-certificates
 
 COPY --from=builder /app/server /server

diff --git a/vpc-sample/requirements.txt b/vpc-sample/requirements.txt
@@ -1,3 +1,3 @@
-google-auth==2.28.1
-requests==2.31.0
-functions-framework==3.5.0
+google-auth==2.30.0
+requests==2.32.3
+functions-framework==3.7.0