Drop the cdk-addons label on ceph and keystone components #233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
addyess
force-pushed
the
akd/actively-ignore-previous-addons
branch
from
f1c0382
to
b11f151
Compare
addyess
force-pushed
the
akd/actively-ignore-previous-addons
branch
from
b11f151
to
39f1468
Compare
addyess
force-pushed
the
akd/actively-ignore-previous-addons
branch
2 times, most recently
from
4a3d491
to
d8b1923
Compare
addyess
force-pushed
the
akd/actively-ignore-previous-addons
branch
from
d8b1923
to
d6be0af
Compare
addyess
commented
Jun 24, 2024
cdk-addons/apply
Outdated
Comment on lines
380
to
389
| # it has our label but isn't a current addon | ||
| if resource in ignored_addons: | ||
| # either actively ignore it | ||
| print("Ignoring %s %s/%s" % resource) | ||
| args = ["label", kind, name, "-n", namespace, "cdk-addons-"] | ||
| else: | ||
| # or delete it! | ||
| print("Deleting %s %s/%s" % resource) | ||
| args = ["delete", "--wait=false", kind, name, "-n", namespace] | ||
|
|
There was a problem hiding this comment.
with these changes the snap outputs this on apply when keystone is enabled:
Retiring addon: keystone
Checking for addons to prune
from /root/snap/cdk-addons/x1/addons/kube-state-metrics-deployment.yaml
from /root/snap/cdk-addons/x1/addons/auth-delegator.yaml
from /root/snap/cdk-addons/x1/addons/kube-state-metrics-cluster-role.yaml
from /root/snap/cdk-addons/x1/addons/core-dns.yaml
from /root/snap/cdk-addons/x1/addons/metrics-apiservice.yaml
from /root/snap/cdk-addons/x1/addons/metrics-server-deployment.yaml
from /root/snap/cdk-addons/x1/addons/kube-state-metrics-cluster-role-binding.yaml
from /root/snap/cdk-addons/x1/addons/resource-reader.yaml
from /root/snap/cdk-addons/x1/addons/auth-reader.yaml
from /root/snap/cdk-addons/x1/addons/kube-state-metrics-service.yaml
from /root/snap/cdk-addons/x1/addons/kube-state-metrics-service-account.yaml
from /root/snap/cdk-addons/x1/addons/kubernetes-dashboard.yaml
from /root/snap/cdk-addons/x1/addons/metrics-server-service.yaml
Checking for addons to ignore
from /root/snap/cdk-addons/x1/addons-retired/keystone-auth-certs-secret.yaml
from /root/snap/cdk-addons/x1/addons-retired/keystone-deployment.yaml
from /root/snap/cdk-addons/x1/addons-retired/keystone-rbac.yaml
from /root/snap/cdk-addons/x1/addons-retired/keystone-service.yamlThere was a problem hiding this comment.
and the label is removed:
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: k8s-keystone-auth
cdk-restart-on-ca-change: "true"
name: k8s-keystone-auth
namespace: kube-systemhmm -- i wonder about that other label cdk-restart-on-ca-change
There was a problem hiding this comment.
Great, now we can remove BOTH labels 🗡️
addyess
force-pushed
the
akd/actively-ignore-previous-addons
branch
from
0d53605
to
8ea6a3c
Compare
addyess
changed the title
kwmonroe
pushed a commit
that referenced
this pull request
Jul 1, 2024
* Drop the cdkaddons label on ceph and keystone components * remove ceph-csi reboot workaround, address retirement collection * Add ceph and k8s keyston to retire commit list * remove cdk-restart-on-ca-change label as well * consolidate kubectl calls in prune method * update calls to ruff * Adjust call to _try_kubectl * Retire components: gpu and cloud-providers * relabel retired components with cdk-addons-retired=true
kwmonroe
pushed a commit
that referenced
this pull request
Jul 1, 2024
* Drop the cdkaddons label on ceph and keystone components * remove ceph-csi reboot workaround, address retirement collection * Add ceph and k8s keyston to retire commit list * remove cdk-restart-on-ca-change label as well * consolidate kubectl calls in prune method * update calls to ruff * Adjust call to _try_kubectl * Retire components: gpu and cloud-providers * relabel retired components with cdk-addons-retired=true
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses Issues
LP#2068770
LP#2070053
LP#2070379
Overview
Actively retire certain addons from cdk-addons management by rendering them into a new directory for the snap to manipulate called
addons-retired, then dropping the cdk-addon label for each component.Details
cdk-addons.applycalled by the charm on each hook, will apply any templates which get rendered into the/root/snap/cdk-addons/current/addonsdirectory. We should ensure than some components are notkubectlapplied in 1.29 and beyond because they may be charm managed or managed manually.cdk-addons.applyalso prunes component which shouldn't be installed. It will find resource with the labelcdk-addons=truein cluster, and if they aren't rendered into theaddonsdirectory, they will be removed. So it's not enough to stop rendering retired components -- we must actively ignore themSince, Ceph and Keystone are being actively dropped starting in the 1.29 release and the cdk-addons snap needs to stop managing them -- the charm will not change the configuration on the stop starting in 1.29, so components like ceph and keystone may still be enabled. If they were enabled pre 1.29, the snap would still be actively managing them.
These changes tell the snap to remove the label from each resource, and to not re-apply the resources if they are removed or changed in the cluster.