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

wip: work on bumping KB #6514

Closed
Closed
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/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: install
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version-file: go.mod

varshaprasad96 marked this conversation as resolved.
Show resolved Hide resolved
- name: gpg init
if: ${{ github.event_name != 'pull_request' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: make test-e2e-integration
12 changes: 6 additions & 6 deletions .github/workflows/test-ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: sudo rm -rf /usr/local/bin/kustomize
- run: make test-e2e-ansible

Expand All @@ -41,12 +41,12 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: sudo rm -rf /usr/local/bin/kustomize
- uses: actions/setup-python@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: make test-unit
- uses: shogo82148/actions-goveralls@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: sudo rm -rf /usr/local/bin/kustomize
- run: make test-e2e-helm
6 changes: 3 additions & 3 deletions .github/workflows/test-sample-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
- run: sudo rm -rf /usr/local/bin/kustomize
- run: make test-e2e-sample-go
8 changes: 4 additions & 4 deletions .github/workflows/test-sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
needs: check_docs_only
if: needs.check_docs_only.outputs.skip != 'true'
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19
id: go
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-go@v3
with:
go-version-file: go.mod
id: go
- run: sudo rm -rf /usr/local/bin/kustomize
- run: make test-sanity

Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,10 @@ test-docs: ## Test doc links

.PHONY: test-unit
TEST_PKGS = $(shell go list ./... | grep -v -E 'github.com/operator-framework/operator-sdk/test/')

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)
test-unit: ## Run unit tests
go test -coverprofile=coverage.out -covermode=count -short $(TEST_PKGS)
KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test -coverprofile=coverage.out -covermode=count -short $(TEST_PKGS)

e2e_tests := test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm test-e2e-integration
e2e_targets := test-e2e $(e2e_tests)
Expand Down
108 changes: 108 additions & 0 deletions changelog/fragments/01-bump-k8s-1.27.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
- (go/v4-alpha) Bump go/v4 plugin from alpha to stable.
kind: "change"
breaking: true
migration:
header: (go/v4-alpha) Move go/v4 plugin from alpha to stable
body: |
The transition from Golang v2 and v3 plugins to the new Golang v4 plugin introduces significant changes.
To gain insights into the reasoning behind these changes, you can refer to the explanation provided
at https://book.kubebuilder.io/migration/v3vsv4#tldr-of-the-new-gov4-plugin.

For a comprehensive understanding of the migration process to the v4 plugin format,
the Kubebuilder documentation outlines the necessary steps. Detailed instructions
can be found at https://book.kubebuilder.io/migration/manually_migration_guide_gov3_to_gov4.

This migration is designed to enhance your project's functionality and compatibility,
reflecting the evolving landscape of Golang development.

- description: >
- (go/v3) Deprecate go/v3 plugin in support of go/v4. Refer `https://book.kubebuilder.io/migration/v3vsv4` for more details.
kind: "deprecation"
breaking: false

- description: >
- (go/v2) Deprecate go/v2 plugin in support of go/v4.
kind: "deprecation"
breaking: false

- description: >
- (go/v4) Bump Kubernetes dependencies to 1.27.
kind: "change"
breaking: true
migration:
header: (go/v4) Bump Kubernetes dependencies to 1.27
body: |
Bump the versions of controller-runtime, ginko. gomega and kubernetes dependencies to k8s 1.27 supported
versions. After migrating to the stable version in go/v4, ensure that the `go.mod` file looks as below:
```
github.com/onsi/ginkgo/v2 v2.9.5
github.com/onsi/gomega v1.27.7
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
sigs.k8s.io/controller-runtime v0.15.0 ```

- description: >
- (ansible/v1, helm/v1) Remove multi-arch and node affinity patch from manager configurations.
kind: "change"
breaking: true
migration:
header: (ansible/v1, helm/v1) Remove multi-arch and node affinity patch from manager configurations.
body: |
Multi-arch and node affinity configurations have been removed from the following files:
1. `config/default/manager_auth_proxy_path.yaml`.
2. If there is an OLM bundle in the project: `bundle/manifests/*.clusterserviceversion.yaml`

Remove the following from the `spec` section of the above mentioned files:
```
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/arch
operator: In
values:
- amd64
- arm64
- ppc64le
- s390x
- key: kubernetes.io/os
operator: In
values:
- linux
```
- description: >
- (ansible/v1, helm/v1) Bump kube-rbac-proxy version from `0.13.1` to `0.14.1`
kind: "change"
breaking: true
migration:
header: (ansible/v1, helm/v1) Bump kube-rbac-proxy version
body: |
Bump the version of kube-rbac-proxy from `0.13.1` to `0.14.1`. In
`config/default/manager_auth_proxy_path.yaml`, ensure that `gcr.io/kubebuilder/kube-rbac-proxy`
has the right version:

```
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
```
- description: >
- (ansible/v1, helm/v1) Use kustomize version `v5.0.1` in projects.
kind: "change"
breaking: true
migration:
header: (ansible/v1, helm/v1) Use kustomize version `v5.0.1`
body: |
In `Makefile` replace the version in kustomize target. Replace:
```
curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.0.1/kustomize_v4.5.7_$(OS)_$(ARCH).tar.gz |
```

with
```
curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v5.0.1/kustomize_v5.0.1_$(OS)_$(ARCH).tar.gz |
```
Loading