From 3067642e72adf734dbc14714b065f5f3a1e73dd2 Mon Sep 17 00:00:00 2001 From: Yuriy Losev Date: Tue, 7 May 2024 00:58:46 +0400 Subject: [PATCH] use golang 1.22 --- .github/workflows/build.yaml | 4 ++-- .github/workflows/lint.yaml | 4 ++-- .github/workflows/tests-labeled.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 96895559..849a8610 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,10 +8,10 @@ jobs: name: Build shell-operator binary runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Check out shell-operator code uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 407b6b2a..66071181 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -10,10 +10,10 @@ jobs: name: Run linter runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Check out shell-operator code uses: actions/checkout@v4 diff --git a/.github/workflows/tests-labeled.yaml b/.github/workflows/tests-labeled.yaml index fe662e7a..ace34a03 100644 --- a/.github/workflows/tests-labeled.yaml +++ b/.github/workflows/tests-labeled.yaml @@ -63,10 +63,10 @@ jobs: cluster_name: "kube-1-27" runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Check out shell-operator code uses: actions/checkout@v4 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cb8fba16..8467e4db 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -9,10 +9,10 @@ jobs: name: Run unit tests runs-on: ubuntu-latest steps: - - name: Set up Go 1.20 + - name: Set up Go 1.22 uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.22" - name: Check out shell-operator code uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 65f38484..30f13292 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM --platform=${TARGETPLATFORM:-linux/amd64} flant/jq:b6be13d5-musl as libjq # Go builder. -FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.20-alpine3.16 AS builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.22-alpine3.19 AS builder ARG appVersion=latest RUN apk --no-cache add git ca-certificates gcc musl-dev libc-dev @@ -30,7 +30,7 @@ ARG TARGETPLATFORM RUN apk --no-cache add ca-certificates bash sed tini && \ kubectlArch=$(echo ${TARGETPLATFORM:-linux/amd64} | sed 's/\/v7//') && \ echo "Download kubectl for ${kubectlArch}" && \ - wget https://storage.googleapis.com/kubernetes-release/release/v1.21.10/bin/${kubectlArch}/kubectl -O /bin/kubectl && \ + wget https://storage.googleapis.com/kubernetes-release/release/v1.27.13/bin/${kubectlArch}/kubectl -O /bin/kubectl && \ chmod +x /bin/kubectl && \ mkdir /hooks ADD frameworks/shell /frameworks/shell