Skip to content

Commit

Permalink
Merge pull request #751 from mjura/workflow-v2.8
Browse files Browse the repository at this point in the history
[v2.8] Enforce latest go version and bump to bci image to 15.6
  • Loading branch information
mjura committed Aug 12, 2024
2 parents 573c5c6 + 476bf1f commit 30c2950
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.ref_name}}
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
check-latest: true
- name: Build and push all image variations
run: |
make operator
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/rancher/eks-operator

go 1.20
go 1.22.0

toolchain go1.22.5

replace k8s.io/client-go => k8s.io/client-go v0.28.6

Expand Down
4 changes: 2 additions & 2 deletions package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.suse.com/bci/bci-base:15.5 AS builder
FROM registry.suse.com/bci/bci-base:15.6 AS builder
RUN sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd
RUN useradd --uid 1007 eks-operator

FROM registry.suse.com/bci/bci-micro:15.5
FROM registry.suse.com/bci/bci-micro:15.6
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /etc/shadow /etc/shadow

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.suse.com/bci/golang:1.21 AS build
FROM registry.suse.com/bci/golang:1.22 AS build
RUN zypper -n install -l openssl-devel
WORKDIR /src
COPY go.mod go.sum /src/
Expand Down

0 comments on commit 30c2950

Please sign in to comment.