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.

Sign up for GitHub

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

Move from go 1.17 to go1.18 #295

Merged
merged 6 commits into from
May 19, 2022
Merged

Move from go 1.17 to go1.18 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c1ce78
go1.18: Update go.mod
swatisehgal May 19, 2022
6670740
go1.18: Update Dockerfiles
swatisehgal May 19, 2022
fc15218
go1.18: Update github CI workflows to go 1.18.1
swatisehgal May 19, 2022
5cca0e0
go1.18: Vendor updates
swatisehgal May 19, 2022
746b7bd
go1.18: local fix to enable go 1.18 support
swatisehgal May 19, 2022
70b85f7
go1.18: Update kustomize to latest version (v4.5.4)
swatisehgal May 19, 2022
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/cibuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18.1

- name: Verify modules
run: go mod verify
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ciformat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18.1

- name: format
run: ./hack/check-format.sh
2 changes: 1 addition & 1 deletion .github/workflows/cilint-custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18.1

- name: Fetch golangci-lint
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cilint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18.1

- name: Verify
uses: golangci/golangci-lint-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18.1

- name: Verify modules
run: go mod verify
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/setup-go@v2
id: go
with:
go-version: 1.17
go-version: 1.18.1

- name: Set release version env var
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.17 as builder
FROM golang:1.18 as builder

WORKDIR /go/src/github.com/openshift-kni/numaresources-operator
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build all the e2e suites
FROM golang:1.17 as builder
FROM golang:1.18 as builder

WORKDIR /go/src/github.com/openshift-kni/numaresources-operator
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi8/ubi

ENV HOME=/home/ci
ENV GOROOT=/usr/local/go
ENV GOVERSION=1.17.2
ENV GOVERSION=1.18.1
ENV GOPATH=/go
ENV GOBIN=${GOPATH}/bin
ENV PATH=${PATH}:${GOROOT}/bin:${GOBIN}
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,26 +236,26 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi

CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])

KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])

ENVTEST = $(shell pwd)/bin/setup-envtest
envtest: ## Download envtest-setup locally if necessary.
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)

# go-get-tool will 'go get' any package $2 and install it to $1.
# go-install-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
define go-get-tool
define go-install-tool
@[ -f $(1) ] || { \
set -e ;\
TMP_DIR=$$(mktemp -d) ;\
cd $$TMP_DIR ;\
go mod init tmp ;\
echo "Downloading $(2)" ;\
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
rm -rf $$TMP_DIR ;\
}
endef
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift-kni/numaresources-operator

go 1.17
go 1.18
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you may want to pull RTE 0.6.0

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for cutting a release on the RTE side!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update this PR now.


require (
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
Expand All @@ -12,7 +12,7 @@ require (
github.com/jaypipes/pcidb v1.0.0
github.com/k8stopologyawareschedwg/deployer v0.6.0
github.com/k8stopologyawareschedwg/noderesourcetopology-api v0.0.12
github.com/k8stopologyawareschedwg/resource-topology-exporter v0.4.3-0.20220407072408-d8e355742882
github.com/k8stopologyawareschedwg/resource-topology-exporter v0.6.0
github.com/kubevirt/device-plugin-manager v1.18.8
github.com/mdomke/git-semver v1.0.0
github.com/onsi/ginkgo v1.16.5
Expand Down
113 changes: 2 additions & 111 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ithub.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/nrtupdater/nrtupdater.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/podrescli/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ithub.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/prometheus/prometheus.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1
github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned
github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned/scheme
github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned/typed/topology/v1alpha1
# github.com/k8stopologyawareschedwg/resource-topology-exporter v0.4.3-0.20220407072408-d8e355742882
## explicit; go 1.17
# github.com/k8stopologyawareschedwg/resource-topology-exporter v0.6.0
## explicit; go 1.18
github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/k8shelpers
github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/kubeconf
github.com/k8stopologyawareschedwg/resource-topology-exporter/pkg/notification
Expand Down