Skip to content

Commit

Permalink
Merge branch 'machine-controller-manager-provider' into sync-upstream…
Browse files Browse the repository at this point in the history
…-v1.29.0
  • Loading branch information
sssash18 authored Apr 25, 2024
2 parents e41730d + 84ae83e commit 206917d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ autoscaler:
dockerfile: './cluster-autoscaler/Dockerfile'
steps:
test:
image: 'golang:1.20.5'
image: 'golang:1.22.2'
build:
image: 'golang:1.20.5'
image: 'golang:1.22.2'
output_dir: 'binary'
jobs:
head-update:
Expand Down Expand Up @@ -131,9 +131,9 @@ vertical-pod-autoscaler:
dir: 'vertical-pod-autoscaler'
steps:
test:
image: 'golang:1.20.5'
image: 'golang:1.22.2'
build:
image: 'golang:1.20.5'
image: 'golang:1.22.2'
output_dir: 'binary'
jobs:
release:
Expand Down
3 changes: 2 additions & 1 deletion builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.21.6

FROM golang:1.22.2
LABEL maintainer="Marcin Wielgus <[email protected]>"

ENV GOPATH /gopath/
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############# builder #############
FROM golang:1.20.5 AS builder
FROM golang:1.22.2 AS builder

WORKDIR /go/src/github.com/gardener/autoscaler
COPY . .
Expand Down

0 comments on commit 206917d

Please sign in to comment.