Skip to content

Commit d2feb60

Browse files
oceanc80oceanc80
committed
Bump golang, k8s
Signed-off-by: Catherine Chan-Tse <[email protected]>
1 parent 06cc99c commit d2feb60

File tree

28 files changed

+981
-822
lines changed

28 files changed

+981
-822
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
registry: quay.io
3535
username: ${{ secrets.QUAY_USERNAME }}
3636
password: ${{ secrets.QUAY_PASSWORD }}
37-
37+
3838
- name: Set up QEMU
3939
uses: docker/setup-qemu-action@v2
4040

‎.github/workflows/test-ansible.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ jobs:
77
name: e2e
88
runs-on: ubuntu-22.04
99
steps:
10-
- uses: actions/setup-go@v3
11-
with:
12-
go-version: 1.19
1310
- uses: actions/checkout@v3
1411
with:
1512
fetch-depth: 0
13+
- uses: actions/setup-go@v4
14+
with:
15+
go-version-file: "go.mod"
1616
- run: sudo rm -rf /usr/local/bin/kustomize
1717
- run: make test-e2e-ansible
1818

1919
e2e-molecule:
2020
name: e2e-molecule
2121
runs-on: ubuntu-22.04
2222
steps:
23-
- uses: actions/setup-go@v3
24-
with:
25-
go-version: 1.19
2623
- uses: actions/checkout@v3
2724
with:
2825
fetch-depth: 0
26+
- uses: actions/setup-go@v4
27+
with:
28+
go-version-file: "go.mod"
2929
- run: sudo rm -rf /usr/local/bin/kustomize
3030
- uses: actions/setup-python@v4
3131
with:

‎.github/workflows/test-sanity.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
name: sanity
88
runs-on: ubuntu-22.04
99
steps:
10-
- uses: actions/setup-go@v3
11-
with:
12-
go-version: 1.19
13-
id: go
1410
- uses: actions/checkout@v3
1511
with:
1612
fetch-depth: 0
13+
- uses: actions/setup-go@v4
14+
with:
15+
go-version-file: "go.mod"
16+
id: go
1717
- run: sudo rm -rf /usr/local/bin/kustomize
1818
- run: make test-sanity

‎.github/workflows/unit.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
name: unit
88
runs-on: ubuntu-22.04
99
steps:
10-
- uses: actions/setup-go@v3
11-
with:
12-
go-version: 1.19
1310
- uses: actions/checkout@v3
1411
with:
1512
fetch-depth: 0
13+
- uses: actions/setup-go@v4
14+
with:
15+
go-version-file: "go.mod"
1616
- run: make test-unit

‎Makefile‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ SHELL = /bin/bash
66
# version is moved to a separate repo and release process.
77
export IMAGE_VERSION = v1.32.0
88
# Build-time variables to inject into binaries
9-
export SIMPLE_VERSION = $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
10-
export GIT_VERSION = $(shell git describe --dirty --tags --always)
11-
export GIT_COMMIT = $(shell git rev-parse HEAD)
12-
export K8S_VERSION = 1.26.0
9+
export SIMPLE_VERSION := $(shell (test "$(shell git describe --tags)" = "$(shell git describe --tags --abbrev=0)" && echo $(shell git describe --tags)) || echo $(shell git describe --tags --abbrev=0)+git)
10+
export GIT_VERSION := $(shell git describe --dirty --tags --always)
11+
export GIT_COMMIT := $(shell git rev-parse HEAD)
12+
export K8S_VERSION = 1.27.0
13+
export ENVTEST_VERSION = 1.27.x
1314

1415
# Build settings
1516
export TOOLS_DIR = tools/bin
@@ -36,6 +37,8 @@ export PATH := $(PWD)/$(BUILD_DIR):$(PWD)/$(TOOLS_DIR):$(PATH)
3637
export IMAGE_REPO ?= quay.io/operator-framework/ansible-operator
3738
export IMAGE_TAG ?= dev
3839

40+
ENVTEST ?= $(LOCALBIN)/setup-envtest
41+
3942
##@ Development
4043

4144
.PHONY: generate
@@ -74,7 +77,7 @@ build: ## Build ansible-operator
7477
@mkdir -p $(BUILD_DIR)
7578
go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./cmd/ansible-operator
7679

77-
.PHONY: build/ansible-operator
80+
.PHONY: build/ansible-operator
7881
build/ansible-operator:
7982
go build $(GO_BUILD_ARGS) -o $(BUILD_DIR)/$(@F) ./cmd/$(@F)
8083

@@ -124,8 +127,13 @@ test-docs: ## Test doc links
124127

125128
.PHONY: test-unit
126129
TEST_PKGS = $(shell go list ./... | grep -v -E 'github.com/operator-framework/ansible-operator-plugins/test/')
127-
test-unit: ## Run unit tests
128-
go test -coverprofile=coverage.out -covermode=count -short $(TEST_PKGS)
130+
test-unit: envtest ## Run unit tests
131+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_VERSION) -p path)" go test -coverprofile=coverage.out -covermode=count -short $(TEST_PKGS)
132+
133+
.PHONY: envtest
134+
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
135+
$(ENVTEST): $(LOCALBIN)
136+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
129137

130138
e2e_tests := test-e2e-ansible test-e2e-ansible-molecule
131139
e2e_targets := test-e2e $(e2e_tests)
@@ -134,7 +142,6 @@ e2e_targets := test-e2e $(e2e_tests)
134142
.PHONY: test-e2e-setup
135143
export KIND_CLUSTER := osdk-test
136144

137-
KUBEBUILDER_ASSETS = $(PWD)/$(shell go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && $(shell go env GOPATH)/bin/setup-envtest use $(K8S_VERSION) --bin-dir tools/bin/ -p path)
138145
test-e2e-setup:: build dev-install cluster-create
139146

140147
.PHONY: cluster-create

‎go.mod‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
module github.com/operator-framework/ansible-operator-plugins
22

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/go-logr/logr v1.2.3
6+
github.com/go-logr/logr v1.2.4
77
github.com/kr/text v0.2.0
88
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
9-
github.com/onsi/ginkgo/v2 v2.7.0
10-
github.com/onsi/gomega v1.24.2
11-
github.com/operator-framework/operator-lib v0.11.1-0.20230306195046-28cadc6b6055
9+
github.com/onsi/ginkgo/v2 v2.12.0
10+
github.com/onsi/gomega v1.27.10
11+
github.com/operator-framework/operator-lib v0.11.1-0.20230717184314-6efbe3a22f6f
1212
github.com/operator-framework/operator-registry v1.28.0
13-
github.com/prometheus/client_golang v1.14.0
14-
github.com/prometheus/client_model v0.3.0
13+
github.com/prometheus/client_golang v1.16.0
14+
github.com/prometheus/client_model v0.4.0
1515
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/afero v1.9.3
17-
github.com/spf13/cobra v1.6.1
16+
github.com/spf13/afero v1.9.5
17+
github.com/spf13/cobra v1.7.0
1818
github.com/spf13/pflag v1.0.5
1919
github.com/spf13/viper v1.10.0
20-
github.com/stretchr/testify v1.8.2
21-
golang.org/x/text v0.9.0
22-
k8s.io/api v0.26.2
23-
k8s.io/apiextensions-apiserver v0.26.2
24-
k8s.io/apimachinery v0.26.2
25-
k8s.io/client-go v0.26.2
20+
github.com/stretchr/testify v1.8.3
21+
golang.org/x/text v0.13.0
22+
k8s.io/api v0.27.7
23+
k8s.io/apiextensions-apiserver v0.27.7
24+
k8s.io/apimachinery v0.27.7
25+
k8s.io/client-go v0.27.7
2626
k8s.io/kubectl v0.26.2
2727
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
28-
sigs.k8s.io/controller-runtime v0.14.5
29-
sigs.k8s.io/kubebuilder/v3 v3.9.1
28+
sigs.k8s.io/controller-runtime v0.15.3
29+
sigs.k8s.io/kubebuilder/v3 v3.12.0
3030
sigs.k8s.io/yaml v1.3.0
3131
)
3232

33-
require github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42 // indirect
33+
require github.com/operator-framework/api v0.17.7-0.20230626210316-aa3e49803e7b // indirect
3434

3535
require (
3636
github.com/Microsoft/hcsshim v0.9.4 // indirect
37-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
37+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3838
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
39-
github.com/benbjohnson/clock v1.3.0 // indirect
4039
github.com/beorn7/perks v1.0.1 // indirect
4140
github.com/blang/semver/v4 v4.0.0 // indirect
4241
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
@@ -46,33 +45,34 @@ require (
4645
github.com/davecgh/go-spew v1.1.1 // indirect
4746
github.com/docker/cli v20.10.21+incompatible // indirect
4847
github.com/docker/docker-credential-helpers v0.7.0 // indirect
49-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
48+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5049
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5150
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5251
github.com/fsnotify/fsnotify v1.6.0 // indirect
53-
github.com/go-logr/zapr v1.2.3 // indirect
54-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
55-
github.com/go-openapi/jsonreference v0.20.0 // indirect
52+
github.com/go-logr/zapr v1.2.4 // indirect
53+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
54+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5655
github.com/go-openapi/swag v0.22.3 // indirect
57-
github.com/gobuffalo/flect v1.0.0 // indirect
56+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
57+
github.com/gobuffalo/flect v1.0.2 // indirect
5858
github.com/gofrs/uuid v4.0.0+incompatible // indirect
5959
github.com/gogo/protobuf v1.3.2 // indirect
6060
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
61-
github.com/golang/protobuf v1.5.2 // indirect
62-
github.com/google/cel-go v0.12.6 // indirect
63-
github.com/google/gnostic v0.6.9 // indirect
61+
github.com/golang/protobuf v1.5.3 // indirect
62+
github.com/google/cel-go v0.16.1 // indirect
63+
github.com/google/gnostic v0.5.7-v3refs // indirect
6464
github.com/google/go-cmp v0.5.9 // indirect
6565
github.com/google/gofuzz v1.2.0 // indirect
66+
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
6667
github.com/google/uuid v1.3.0 // indirect
6768
github.com/gorilla/handlers v1.5.1 // indirect
6869
github.com/h2non/filetype v1.1.1 // indirect
6970
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
7071
github.com/hashicorp/hcl v1.0.0 // indirect
7172
github.com/imdario/mergo v0.3.13 // indirect
72-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
73+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7374
github.com/josharian/intern v1.0.0 // indirect
7475
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/kr/pretty v0.3.1 // indirect
7676
github.com/magiconair/properties v1.8.5 // indirect
7777
github.com/mailru/easyjson v0.7.7 // indirect
7878
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -86,39 +86,39 @@ require (
8686
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
8787
github.com/pkg/errors v0.9.1 // indirect
8888
github.com/pmezard/go-difflib v1.0.0 // indirect
89-
github.com/prometheus/common v0.37.0 // indirect
90-
github.com/prometheus/procfs v0.8.0 // indirect
89+
github.com/prometheus/common v0.44.0 // indirect
90+
github.com/prometheus/procfs v0.10.1 // indirect
9191
github.com/spf13/cast v1.5.0 // indirect
9292
github.com/spf13/jwalterweatherman v1.1.0 // indirect
9393
github.com/stoewer/go-strcase v1.2.0 // indirect
9494
github.com/subosito/gotenv v1.2.0 // indirect
9595
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
9696
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
9797
go.opentelemetry.io/otel/trace v1.14.0 // indirect
98-
go.uber.org/atomic v1.10.0 // indirect
99-
go.uber.org/goleak v1.2.1 // indirect
100-
go.uber.org/multierr v1.8.0 // indirect
101-
go.uber.org/zap v1.24.0 // indirect
102-
golang.org/x/mod v0.10.0 // indirect
103-
golang.org/x/net v0.10.0 // indirect
104-
golang.org/x/oauth2 v0.6.0 // indirect
105-
golang.org/x/sys v0.8.0 // indirect
106-
golang.org/x/term v0.8.0 // indirect
98+
go.uber.org/multierr v1.11.0 // indirect
99+
go.uber.org/zap v1.25.0 // indirect
100+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
101+
golang.org/x/mod v0.12.0 // indirect
102+
golang.org/x/net v0.17.0 // indirect
103+
golang.org/x/oauth2 v0.8.0 // indirect
104+
golang.org/x/sys v0.13.0 // indirect
105+
golang.org/x/term v0.13.0 // indirect
107106
golang.org/x/time v0.3.0 // indirect
108-
golang.org/x/tools v0.9.1 // indirect
109-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
107+
golang.org/x/tools v0.12.0 // indirect
108+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
110109
google.golang.org/appengine v1.6.7 // indirect
111-
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
112-
google.golang.org/grpc v1.53.0 // indirect
113-
google.golang.org/protobuf v1.29.1 // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
111+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
112+
google.golang.org/grpc v1.54.0 // indirect
113+
google.golang.org/protobuf v1.30.0 // indirect
114114
gopkg.in/inf.v0 v0.9.1 // indirect
115115
gopkg.in/ini.v1 v1.66.2 // indirect
116116
gopkg.in/yaml.v2 v2.4.0 // indirect
117117
gopkg.in/yaml.v3 v3.0.1 // indirect
118-
k8s.io/component-base v0.26.2 // indirect
119-
k8s.io/klog/v2 v2.90.1 // indirect
120-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
121-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
118+
k8s.io/component-base v0.27.7 // indirect
119+
k8s.io/klog/v2 v2.100.1 // indirect
120+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
121+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
122122
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
123123
)
124124

0 commit comments

Comments
 (0)