Skip to content

Commit

Permalink
Update some images in examples and tests (#876)
Browse files Browse the repository at this point in the history
Use artifact registry url for gb-frontend instead of gcr as images in gcr are not tagged anymore
Use registry.k8s.io instead of k8s.gcr.io
Bump k8s version in github workflow to 1.21 from 1.16

Signed-off-by: Praveen Rewar <[email protected]>
  • Loading branch information
praveenrewar authored Dec 18, 2023
1 parent af9b0fb commit 0f793e1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-gh-k8s-1.16.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test-gh-k8s-1.16
name: test-gh-k8s-1.21
on:
push:
branches:
Expand All @@ -7,7 +7,7 @@ on:
types: [opened, reopened, synchronize]
jobs:
test-all:
name: Test GH
name: Test GH 1.21
runs-on: ubuntu-20.04
steps:
- name: Set up Go
Expand All @@ -34,9 +34,9 @@ jobs:
wget -O- https://carvel.dev/install.sh | K14SIO_INSTALL_BIN_DIR=/tmp/bin bash
wget -O- https://github.com/kubernetes/minikube/releases/download/v1.10.0/minikube-linux-amd64 > /tmp/bin/minikube
chmod +x /tmp/bin/minikube
minikube start --driver=docker --kubernetes-version 1.16.0
curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
install minikube-linux-amd64 /usr/local/bin/minikube
minikube start --driver=docker --kubernetes-version 1.21.0
eval $(minikube docker-env --shell=bash)
# Ensure that there is no existing kapp installed
Expand Down
4 changes: 2 additions & 2 deletions examples/gitops/guestbook/all-in-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: primary
image: k8s.gcr.io/redis:e2e #! or just image: redis
image: registry.k8s.io/redis:e2e #! or just image: redis
resources:
requests:
cpu: 120m
Expand Down Expand Up @@ -140,7 +140,7 @@ spec:
spec:
containers:
- name: php-redis
image: gcr.io/google-samples/gb-frontend:v4
image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5
resources:
requests:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion examples/gitops/redis-with-configmap/redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
spec:
containers:
- name: redis
image: k8s.gcr.io/redis:e2e
image: registry.k8s.io/redis:e2e
ports:
- containerPort: 6379
resources:
Expand Down
2 changes: 1 addition & 1 deletion examples/sts-alternative/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ metadata:
spec:
containers:
- name: redis
image: k8s.gcr.io/redis:e2e
image: registry.k8s.io/redis:e2e
ports:
- containerPort: 6379
resources:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/wait_timeout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestWaitTimeout(t *testing.T) {
spec:
containers:
- name: successful-job
image: busybox
image: busybox
command: ["/bin/sh", "-c", "sleep 10"]
restartPolicy: Never
`
Expand Down

0 comments on commit 0f793e1

Please sign in to comment.