Upgrade SDK to use Kubernetes 1.26.2#6352

Merged

rashmigottipati merged 16 commits into

operator-framework:masterfrom

rashmigottipati:k8sbump

Mar 14, 2023

rashmigottipati commented Mar 8, 2023 •

edited

Loading

Member

Description of the change:

Changes in go.mod and go.sum resulted from bumping versions to support k8s 1.26.2
Changes in files due to deprecated types in apimachinery
Used generic set in files where sets.String is used, which has been deprecated
Fixed lint errors

Motivation for the change:
Support for k8s 1.26

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Add a new changelog fragment in changelog/fragments (see changelog/fragments/00-template.yaml)
Add or update relevant sections of the docs website in website/content/en/docs

openshift-ci Bot requested review from theishshah and varshaprasad96

March 8, 2023 18:00

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:01

— with

GitHub Actions Inactive

rashmigottipati commented Mar 8, 2023

Member Author

/cc @everettraven @varshaprasad96

openshift-ci Bot requested a review from everettraven

March 8, 2023 18:01

rashmigottipati commented

View reviewed changes

rashmigottipati left a comment

Member Author

Todo for myself: Add changelog :)

everettraven requested changes

View reviewed changes

everettraven left a comment

Contributor

Overall the changes look good to me - great work @rashmigottipati!

The only glaring thing for me is pulling in Kubebuilder 3.9.0 which has a known bug that could break the scaffolding of Go operators.

go.mod Outdated

internal/plugins/ansible/v1/api.go

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Error

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Failure

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Error

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Error

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Failure

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:38

— with

GitHub Actions Inactive

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Error

rashmigottipati had a problem deploying to deploy

March 8, 2023 18:38

— with

GitHub Actions Failure

rashmigottipati temporarily deployed to deploy

March 8, 2023 18:38

— with

GitHub Actions Inactive

rashmigottipati force-pushed the k8sbump branch from e72be09 to b4223db Compare

March 9, 2023 02:59

rashmigottipati temporarily deployed to deploy

March 9, 2023 03:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 03:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 03:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 03:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 03:00

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 17:32

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 9, 2023 17:32

— with

GitHub Actions Inactive

varshaprasad96 reviewed

View reviewed changes

go.mod Outdated

internal/cmd/operator-sdk/cli/cli.go

testdata/go/v3/memcached-operator/config/crd/bases/cache.example.com_memcacheds.yaml

...data/go/v3/memcached-operator/bundle/manifests/memcached-operator.clusterserviceversion.yaml

testdata/go/v3/memcached-operator/config/default/manager_auth_proxy_patch.yaml

testdata/go/v3/memcached-operator/go.mod

testdata/go/v4-alpha/monitoring/memcached-operator/Dockerfile

               COPY api/ api/
-              COPY controllers/ controllers/
+              COPY internal/controller/ internal/controller/
               COPY monitoring/ monitoring/

varshaprasad96 Mar 9, 2023

Member

We would have to look into if we can rip of certain parts of monitoring/ and put it with internal/controller/. I assume the most of the registration of metrics would be done in the controller. This investigation is just for follow up not this PR.

everettraven approved these changes

View reviewed changes

everettraven left a comment

Contributor

Overall looks good to me. Just some nits but I don't think they should block this PR from merging

go.mod Outdated

hack/generate/samples/internal/go/memcached-with-customization/memcached_with_customization.go

hack/generate/samples/internal/go/memcached-with-customization/memcached_with_customization.go

internal/cmd/operator-sdk/cli/cli.go

rashmigottipati and others added 11 commits

March 13, 2023 15:22


          update k8s dependencies to 1.26.2

06c4b5d

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Fix sanity tests (partial)

1ec5738

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Use generic set in api-machinery instead of sets.String type

fa0f128

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Fix more errors with deprecated types

920aa70

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Update kubebuilder to latest patch release v3.9.1

e3f8d0f

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Fix sanity tests by removing code snippets as latest kubebuilder fixe…

9e1ba48

…d YAML formatting issues

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Modify gov4alpha plugin to use go/v4-alpha from KB

97a1c02

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>


          Fix sanity test

173a00a

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Address review comments

bd56bd1

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Address review suggestions #2

1bab3d6

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Add changelog and TODO

552e72e

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

rashmigottipati temporarily deployed to deploy

March 13, 2023 19:22

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 13, 2023 19:22

— with

GitHub Actions Inactive

rashmigottipati temporarily deployed to deploy

March 13, 2023 19:22

— with

GitHub Actions Inactive


          Fix sanity tests

2f0d85c

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

everettraven approved these changes

View reviewed changes

everettraven left a comment

Contributor

Everything looks good to me - just noticed a tiny typo. Great work @rashmigottipati !

/lgtm

changelog/fragments/bump-1.26.yaml Outdated

rashmigottipati added 2 commits

March 13, 2023 15:52


          Fix typo in changelog

cbfc968

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>


          Fix bug thats causing sanity tests to fail

4e0bc11

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

everettraven approved these changes

View reviewed changes

everettraven left a comment

Contributor

/lgtm

varshaprasad96 requested changes

View reviewed changes

varshaprasad96 left a comment

Member

@rashmigottipati the changes look good, but we are missing migration guide entries especially for go/v4alpha. It is necessary because any user who has scaffolded gov4alpha plugin with SDK 1.26.1 should be able to follow the changes in migration guide and migrate their project to 1.27 (upcoming release). Also since the description in changeling fragment is an array, it would be helpful to have a separate entry for each, so that it appears like this in the website.

testdata/go/v3/memcached-operator/Makefile

testdata/go/v3/memcached-operator/Makefile

testdata/go/v4-alpha/memcached-operator/Dockerfile

testdata/go/v4-alpha/memcached-operator/api/v1alpha1/webhook_suite_test.go


          Upgrade migration entries

0709b96

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

varshaprasad96 approved these changes

View reviewed changes

varshaprasad96 left a comment

Member

Just two changes, rest looks good! Thanks for working on this @rashmigottipati :)

/lgtm

changelog/fragments/bump-1.26.yaml Outdated

changelog/fragments/bump-1.26.yaml Outdated


          Address PR review

13fc15a

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>

everettraven approved these changes

View reviewed changes

everettraven left a comment

Contributor

/lgtm

rashmigottipati mentioned this pull request

Meta Issue for K8S 1.26 #6128

Closed

13 tasks

simararneja reviewed

View reviewed changes

changelog/fragments/bump-1.26.yaml

Comment on lines +38 to +54

+                      Regarding the upcoming major changes in the plugin, please note that `go/v3` is being deprecated by Kubebuilder hence Operator SDK would also be migrating to `go/v4` soon.
+                      Following are the changes to be addressed in your project structure, `Makefile` and `go.mod` files:
+) [go/v3, ansible/v1, helm/v1] Update your `go.mod` file to upgrade the dependencies and run `go mod tidy` to download them
+                      ```go
+                      k8s.io/api v0.26.2
+                      k8s.io/apiextensions-apiserver v0.26.2
+                      k8s.io/apimachinery v0.26.2
+                      k8s.io/cli-runtime v0.26.2
+                      k8s.io/client-go v0.26.2
+                      k8s.io/kubectl v0.26.2
+                      sigs.k8s.io/controller-runtime v0.14.5
+                      sigs.k8s.io/controller-tools v0.11.3
+                      sigs.k8s.io/kubebuilder/v3 v3.9.1
+                      ```
+) [go/v3, ansible/v1, helm/v1] With the bump to Kubebuilder 3.9.1, the `go/v3` projects are now scaffolded with 0.13.1 version of kube-rbac-proxy. Modify the version of kube-rbac-proxy in the following scaffolded files:
+                      - config/default/manager_auth_proxy_patch.yaml
+                      - bundle/manifests/memcached-operator.clusterserviceversion.yaml

simararneja Apr 7, 2023 •

edited

Loading

Contributor

@rashmigottipati This isn't rendering as expected in the docs https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.28.0/#upgrade-k8s-versions-to-use-126

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm