Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to go-1.21 #345

Merged
merged 4 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Log in to the container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.DOCKER_REGISTRY_USER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up Go 1.19
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: '1.19.x'
go-version: '1.21.x'

- name: Check (lint) and Test
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 AS builder
FROM golang:1.21 AS builder

WORKDIR /go/src/github.com/metal-stack/gardener-extension-provider-metal
COPY . .
Expand Down
22 changes: 13 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ VERIFY := true
LEADER_ELECTION := false
IGNORE_OPERATION_ANNOTATION := false
WEBHOOK_CONFIG_URL := localhost

GOLANGCI_LINT_VERSION := v1.48.0
GO_VERSION := 1.21
GOLANGCI_LINT_VERSION := v1.54.2

ifeq ($(CI),true)
DOCKER_TTY_ARG=""
Expand Down Expand Up @@ -81,10 +81,11 @@ generate: $(HELM)
.PHONY: generate-in-docker
generate-in-docker: revendor $(HELM)
echo $(shell git describe --abbrev=0 --tags) > VERSION
docker run --rm -i$(DOCKER_TTY_ARG) -v $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:1.19.4 \
sh -c "cd /go/src/github.com/metal-stack/gardener-extension-provider-metal \
&& make generate \
&& chown -R $(shell id -u):$(shell id -g) ."
docker run --rm -i$(DOCKER_TTY_ARG) \
--volume $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:$(GO_VERSION) \
sh -c "cd /go/src/github.com/metal-stack/gardener-extension-provider-metal \
&& make generate \
&& chown -R $(shell id -u):$(shell id -g) ."

.PHONY: format
format: $(GOIMPORTS)
Expand All @@ -96,9 +97,12 @@ test:

.PHONY: test-in-docker
test-in-docker: revendor
docker run --rm -i$(DOCKER_TTY_ARG) -v $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:1.19.4 \
sh -c "cd /go/src/github.com/metal-stack/gardener-extension-provider-metal \
&& make install check test"
docker run --rm -i$(DOCKER_TTY_ARG) \
--user $$(id -u):$$(id -g) \
--mount type=tmpfs,destination=/.cache \
--volume $(PWD):/go/src/github.com/metal-stack/gardener-extension-provider-metal golang:$(GO_VERSION) \
sh -c "cd /go/src/github.com/metal-stack/gardener-extension-provider-metal \
&& make install check test"

.PHONY: test-cov
test-cov:
Expand Down
4 changes: 2 additions & 2 deletions example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ metadata:
name: provider-metal
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: v0.20.18
tag: v0.20.19
---
apiVersion: core.gardener.cloud/v1beta1
kind: ControllerRegistration
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/metal-stack/gardener-extension-provider-metal

go 1.19
go 1.21

require (
github.com/Masterminds/semver v1.5.0
Expand All @@ -27,7 +27,6 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery v0.27.4
Expand Down
9 changes: 7 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
Expand Down Expand Up @@ -118,6 +119,7 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
Expand Down Expand Up @@ -389,6 +391,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
Expand Down Expand Up @@ -541,6 +544,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand Down Expand Up @@ -611,12 +615,14 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
Expand Down Expand Up @@ -654,8 +660,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
Expand Down Expand Up @@ -764,6 +768,7 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down
3 changes: 1 addition & 2 deletions pkg/controller/controlplane/valuesprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import (
"net/url"
"os"
"path/filepath"
"slices"
"strings"
"time"

"golang.org/x/exp/slices"

"github.com/gardener/gardener/extensions/pkg/util"
"github.com/metal-stack/metal-go/api/client/network"
"github.com/metal-stack/metal-go/api/models"
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/controlplane/valuesprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"testing"
"time"

"slices"

"github.com/go-openapi/strfmt"
"github.com/google/go-cmp/cmp"
"github.com/metal-stack/metal-go/api/models"
"github.com/metal-stack/metal-lib/pkg/pointer"
"github.com/metal-stack/metal-lib/pkg/testcommon"
"golang.org/x/exp/slices"
)

func Test_firewallCompareFunc(t *testing.T) {
Expand Down