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

peerpod-ctrl: Upgrade controller-tools version to latest v0.14.0 #1745

Conversation

ANJANA-A-R-K
Copy link
Contributor

  • Upgrade controller-tools version from v0.10.0 to latest v0.14.0

Fixes: #1744

peerpod-ctrl is deployed with make deploy on s390x

root@anjana-vsi:~/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl# make deploy
mkdir -p /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin
test -s /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/controller-gen || GOBIN=/root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
/root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/controller-gen rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
test -s /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/kustomize || { curl -Ss "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s -- 5.3.0 /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin; }
v5.3.0
kustomize installed to /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/kustomize
cd config/manager && /root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/kustomize edit set image controller=quay.io/confidential-containers/peerpod-ctrl:latest
/root/se-pp-testcase/controller-tool-localtest/cloud-api-adaptor/peerpod-ctrl/bin/kustomize build config/default | kubectl apply -f -
# Warning: 'bases' is deprecated. Please use 'resources' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
namespace/confidential-containers-system created
customresourcedefinition.apiextensions.k8s.io/peerpods.confidentialcontainers.org configured
serviceaccount/peerpod-ctrl-controller-manager created
role.rbac.authorization.k8s.io/peerpod-ctrl-leader-election-role created
clusterrole.rbac.authorization.k8s.io/peerpod-ctrl-manager-role configured
clusterrole.rbac.authorization.k8s.io/peerpod-ctrl-metrics-reader unchanged
clusterrole.rbac.authorization.k8s.io/peerpod-ctrl-proxy-role unchanged
rolebinding.rbac.authorization.k8s.io/peerpod-ctrl-leader-election-rolebinding created
clusterrolebinding.rbac.authorization.k8s.io/peerpod-ctrl-manager-rolebinding unchanged
clusterrolebinding.rbac.authorization.k8s.io/peerpod-ctrl-proxy-rolebinding unchanged
service/peerpod-ctrl-controller-manager-metrics-service created
deployment.apps/peerpod-ctrl-controller-manager created

@ANJANA-A-R-K ANJANA-A-R-K force-pushed the contoller-tool-version branch 5 times, most recently from 6871a41 to 2fc8343 Compare March 15, 2024 18:48
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit check is failing. I think this is due to the commit not having a body, so please add a description of what/why you are making this change. The controller and webhook CIs are also failing with go module issues. Please run make verify on each of the changed components to test the errors locally.

@ANJANA-A-R-K ANJANA-A-R-K changed the title Upgrade: Upgrade controller-tools version to latest v0.14.0 peerpod-ctrl: Upgrade controller-tools version to latest v0.14.0 Mar 18, 2024
Copy link
Member

@liudalibj liudalibj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ANJANA-A-R-K you need run make generate for the three operator and commit the update files together.

go: downloading golang.org/x/text v0.14.0
/home/runner/work/cloud-api-adaptor/cloud-api-adaptor/peerpodconfig-ctrl/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
diff --git a/peerpodconfig-ctrl/api/v1alpha1/zz_generated.deepcopy.go b/peerpodconfig-ctrl/api/v1alpha1/zz_generated.deepcopy.go
index e604c10..0846d9e 100644
--- a/peerpodconfig-ctrl/api/v1alpha1/zz_generated.deepcopy.go
+++ b/peerpodconfig-ctrl/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright Confidential Containers Contributors
make: *** [Makefile:202: verify-gen] Error 1
generated files are out of date, run make generate
Error: Process completed with exit code 2.

Copy link
Member

@liudalibj liudalibj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @ANJANA-A-R-K

@stevenhorsman
Copy link
Member

@ANJANA-A-R-K - can you fixup the 2nd and 3rd commits into the top one please and rebase to pick up the latest changes? Give me a shout if you hit and difficulties. Thanks!

Upgrade controller-tools version from v0.10.0 to latest v0.14.0

Fixes: confidential-containers#1744

Signed-off-by: ANJANA-A-R-K1 <anjana.a.r.k1@ibm.com>
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks!

@stevenhorsman stevenhorsman merged commit e82aee5 into confidential-containers:main Mar 21, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to deploy peerpod-ctrl from s390x machine
3 participants