From ae452620de6378923d66c79ba9e6dfb7e3b0c136 Mon Sep 17 00:00:00 2001 From: rcmadhankumar Date: Mon, 15 Apr 2024 11:52:11 +0530 Subject: [PATCH 1/2] Bumping go version to 1.21.9 Signed-off-by: rcmadhankumar --- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-gh-k8s-1.16.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 9398bcd14..d779fdd29 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.21.5 + go-version: 1.21.9 - uses: actions/checkout@v2 with: fetch-depth: '0' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 25206c719..dea873b16 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.21.5 + go-version: 1.21.9 - name: Retrieve version run: | echo "TAG_NAME=$(echo ${{ github.ref }} | grep -Eo 'v[0-9].*')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/test-gh-k8s-1.16.yml b/.github/workflows/test-gh-k8s-1.16.yml index 87813041b..871a46339 100644 --- a/.github/workflows/test-gh-k8s-1.16.yml +++ b/.github/workflows/test-gh-k8s-1.16.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.21.5 + go-version: 1.21.9 - name: Check out code into the Go module directory uses: actions/checkout@v2 with: diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index 32a80d90f..2f816248a 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.21.5 + go-version: 1.21.9 - name: Check out code into the Go module directory uses: actions/checkout@v2 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index ee117089f..3f55d8a59 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: carvel-dev/kapp tool: kapp - goVersion: 1.21.5 + goVersion: 1.21.9 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} From 8e3a289d5f97f067831bc0f5a573ea842da976fe Mon Sep 17 00:00:00 2001 From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:06:10 +0530 Subject: [PATCH 2/2] Update some images in examples and tests (#876) 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 <8457124+praveenrewar@users.noreply.github.com> --- .github/workflows/test-gh-k8s-1.16.yml | 10 +++++----- examples/gitops/guestbook/all-in-one.yml | 4 ++-- examples/gitops/redis-with-configmap/redis.yml | 2 +- examples/sts-alternative/config.yml | 2 +- test/e2e/wait_timeout_test.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-gh-k8s-1.16.yml b/.github/workflows/test-gh-k8s-1.16.yml index 871a46339..3cf89a6c7 100644 --- a/.github/workflows/test-gh-k8s-1.16.yml +++ b/.github/workflows/test-gh-k8s-1.16.yml @@ -1,4 +1,4 @@ -name: test-gh-k8s-1.16 +name: test-gh-k8s-1.21 on: push: branches: @@ -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 @@ -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 diff --git a/examples/gitops/guestbook/all-in-one.yml b/examples/gitops/guestbook/all-in-one.yml index e90e21d77..4148b54e8 100644 --- a/examples/gitops/guestbook/all-in-one.yml +++ b/examples/gitops/guestbook/all-in-one.yml @@ -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 @@ -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 diff --git a/examples/gitops/redis-with-configmap/redis.yml b/examples/gitops/redis-with-configmap/redis.yml index 440fe2a5b..d852bcefc 100644 --- a/examples/gitops/redis-with-configmap/redis.yml +++ b/examples/gitops/redis-with-configmap/redis.yml @@ -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: diff --git a/examples/sts-alternative/config.yml b/examples/sts-alternative/config.yml index d3977ad53..ca0eef43c 100644 --- a/examples/sts-alternative/config.yml +++ b/examples/sts-alternative/config.yml @@ -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: diff --git a/test/e2e/wait_timeout_test.go b/test/e2e/wait_timeout_test.go index 7214fa6df..c47276223 100644 --- a/test/e2e/wait_timeout_test.go +++ b/test/e2e/wait_timeout_test.go @@ -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 `