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

Bump versions for k8s 1.24 #5843

Merged
merged 29 commits into from
Jun 10, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
23ceb3c
Bump versions for k8s 1.24
asmacdo Jun 8, 2022
0cf7b68
updates to resolve test failures
everettraven Jun 9, 2022
1cf485a
update changelog
everettraven Jun 9, 2022
668b932
update sanity go version
everettraven Jun 9, 2022
b896866
update to go 1.18
everettraven Jun 9, 2022
c86b4f7
updates for golangci-lint
everettraven Jun 9, 2022
5fcb47a
update some go1.18 lint issues
everettraven Jun 9, 2022
20b71e9
commit go.mod
everettraven Jun 9, 2022
c192f3c
update more lint problems
everettraven Jun 9, 2022
0b0083c
update java plugin
everettraven Jun 9, 2022
4c9c554
Merge branch 'master' into 2142-bump-k8s124
everettraven Jun 9, 2022
cdd2ae2
update go.mod
everettraven Jun 9, 2022
b053e48
update actions to use go 1.18
everettraven Jun 9, 2022
b7b0924
update changelog
everettraven Jun 9, 2022
3be29e0
update changelog as per review
everettraven Jun 9, 2022
3692d27
update changelog
everettraven Jun 9, 2022
2ff0f7a
update changelog
everettraven Jun 9, 2022
1974fe0
update changelog
everettraven Jun 9, 2022
4ad8f19
update changelog
everettraven Jun 9, 2022
e3cca5f
update changelog
everettraven Jun 9, 2022
d7cde37
updates to changelog per reviews
everettraven Jun 9, 2022
1ccecca
more changelog
everettraven Jun 9, 2022
b30c7a8
address nits
everettraven Jun 9, 2022
d3af0c6
update opm
everettraven Jun 10, 2022
7493c7a
update Go in docker images
everettraven Jun 10, 2022
729873c
update go in docs
everettraven Jun 10, 2022
9e71934
add newline to changelog
everettraven Jun 10, 2022
9a5fbdd
add opm detailed entries
everettraven Jun 10, 2022
c7bb4f8
fix changelog failure
everettraven Jun 10, 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/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: install
everettraven marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18

- name: gpg init
if: github.event_name != 'pull_request'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand All @@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
everettraven marked this conversation as resolved.
Show resolved Hide resolved
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand All @@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
id: go
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ test-sanity: generate fix ## Test repo formatting, linting, etc.
./hack/check-license.sh
./hack/check-error-log-msg-format.sh
go vet ./...
$(SCRIPTS_DIR)/fetch golangci-lint 1.31.0 && $(TOOLS_DIR)/golangci-lint run
$(SCRIPTS_DIR)/fetch golangci-lint 1.46.2 && $(TOOLS_DIR)/golangci-lint run
git diff --exit-code # diff again to ensure other checks don't change repo

.PHONY: test-docs
Expand Down
63 changes: 63 additions & 0 deletions changelog/fragments/k8s-1.24-bump.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# entries is a list of entries to include in
# release notes and/or the migration guide

# TODO(everettraven): update changelog
entries:
- description: >
Bump dependencies to support Kubernetes 1.24.
Projects scaffolded with the go/v3 plugin now support Go 1.18 - [More info](https://github.com/kubernetes-sigs/kubebuilder/commit/02da15bfc32c9deb030a811d16da45ace5cc8db8).

Dependency bumps that occurred are as follows:

- github.com/operator-framework/helm-operator-plugins --> commit d3967d2ae2acf40cca1bf4215508b10a55ea6755
- github.com/operator-framework/java-operator-plugins --> v0.5.1
- helm.sh/helm/v3 --> v3.9.0
- k8s.io/api --> v0.24.0
- k8s.io/apiextensions-apiserver --> v0.24.0
- k8s.io/apimachinery --> v0.24.0
- k8s.io/cli-runtime --> v0.24.0
- k8s.io/client-go --> v0.24.0
- k8s.io/kubectl --> v0.24.0
- sigs.k8s.io/controller-runtime --> v0.12.1
- sigs.k8s.io/controller-tools --> v0.9.0
- sigs.k8s.io/kubebuilder/v3 --> commit eea565cb3f508d7bcf10831d2b761dbf59af6db0

Additional Changes:

- :bug: fix channel naming validation by @camilamacedo86 [More info](https://github.com/operator-framework/api/pull/231)
- Add CRD description check validation by @ryantking [More info](https://github.com/operator-framework/api/pull/234)
- :sparkles: (GoodPracticesValidator) : Add a new check to warn authors when permissions to create CRDs are found by @camilamacedo86 [More info](https://github.com/operator-framework/api/pull/241)

everettraven marked this conversation as resolved.
Show resolved Hide resolved
# kind is one of:
# - addition
# - change
# - deprecation
# - removal
# - bugfix
kind: "change"

# Is this a breaking change?
breaking: false

# Migration can be defined to automatically add a section to
# the migration guide. This is required for breaking changes.
migration:
header: Kubernetes 1.24 and Go 1.18 support
body: |
To update your project to support Kubernetes 1.24:

In the `go.mod` file change the following dependencies:
- k8s.io/* --> v0.24.0
- sigs.k8s.io/controller-runtime --> v0.12.1

In the `Makefile` update the line:
`CONTROLLER_TOOLS_VERSION ?= 0.8.0` to `CONTROLLER_TOOLS_VERSION ?= 0.9.0`

Run `make manifests` to regenerate the manifests

To update your project to use Go 1.18:

In the `go.mod` file update the line:
`go 1.17` to `go 1.18`

Run `go mod tidy`
Loading