Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 3c34d46

Browse files
authored
Upgrade build tools (#71)
1 parent d4d0076 commit 3c34d46

File tree

79 files changed

+143
-1800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+143
-1800
lines changed

.github/workflows/feature-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Go
2828
uses: actions/setup-go@v2
2929
with:
30-
go-version: 1.16.x
30+
go-version: 1.17.x
3131
- name: Login to container registry
3232
uses: docker/login-action@v1
3333
with:

.github/workflows/kuttl-e2e-test-1.19.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
access_token: ${{ github.token }}
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16'
21+
go-version: '1.17'
2222

2323
- name: Checkout portal-manager
2424
uses: actions/checkout@v2

.github/workflows/kuttl-e2e-test-1.20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
access_token: ${{ github.token }}
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16'
21+
go-version: '1.17'
2222

2323
- name: Checkout portal-manager
2424
uses: actions/checkout@v2

.github/workflows/kuttl-e2e-test-1.21.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
access_token: ${{ github.token }}
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16'
21+
go-version: '1.17'
2222

2323
- name: Checkout portal-manager
2424
uses: actions/checkout@v2

.github/workflows/kuttl-e2e-test-1.22.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
access_token: ${{ github.token }}
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16'
21+
go-version: '1.17'
2222

2323
- name: Checkout portal-manager
2424
uses: actions/checkout@v2

.github/workflows/kuttl-e2e-test-1.23.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
access_token: ${{ github.token }}
1919
- uses: actions/setup-go@v2
2020
with:
21-
go-version: '1.16'
21+
go-version: '1.17'
2222

2323
- name: Checkout portal-manager
2424
uses: actions/checkout@v2

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set up Go
3838
uses: actions/setup-go@v2
3939
with:
40-
go-version: 1.16
40+
go-version: 1.17
4141

4242
- uses: actions/checkout@v2
4343

.github/workflows/test-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v2
3232
- uses: actions/setup-go@v2
3333
with:
34-
go-version: '1.16.2'
34+
go-version: '1.17.11'
3535
- name: Run go tidy
3636
run: make tidy && git diff --exit-code && test -z "$(git ls-files --exclude-standard --others | tee /dev/fd/2)"
3737
- name: Run go test

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.16 as builder
2+
FROM golang:1.17.11 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ OPERATOR_IMAGE ?= storageos/portal-manager:test
1111
# Image URL for manifest image.
1212
MANIFESTS_IMAGE ?= storageos/portal-manager-manifests:test
1313

14-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
15-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
16-
1714
# Generate kuttl e2e tests for the following storageos/kind-node versions
1815
# TEST_KIND_NODES is not intended to be updated manually.
1916
# Please run 'LATEST_KIND_NODE=<latest-kind-node> make update-kind-nodes'.
@@ -54,7 +51,7 @@ help: ## Display this help.
5451
##@ Development
5552

5653
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
57-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=storageos-portal-manager paths="./..." output:crd:artifacts:config=config/crd/bases output:rbac:artifacts:config=config/rbac/bases
54+
$(CONTROLLER_GEN) crd paths=./api/... rbac:roleName=storageos-portal-manager paths="./..." output:crd:artifacts:config=config/crd/bases output:rbac:artifacts:config=config/rbac/bases
5855

5956
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
6057
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -126,11 +123,11 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
126123

127124
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
128125
controller-gen: ## Download controller-gen locally if necessary.
129-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.1)
126+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0)
130127

131128
KUSTOMIZE = $(shell pwd)/bin/kustomize
132129
kustomize: ## Download kustomize locally if necessary.
133-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
130+
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.5)
134131

135132
HUSKY = $(shell pwd)/bin/husky
136133
.PHONY: husky

0 commit comments

Comments
 (0)