Add chartmigration resource and disable chartconfig controller #358
Conversation
| E2E_TEST_DIR: "integration/test/chartconfig/chartvalues" | ||
| E2E_TESTED_VERSION: "current" | ||
| <<: *e2eTest | ||
|
|
There was a problem hiding this comment.
chartconfig tests get removed.
| chartConfig, err := r.g8sClient.CoreV1alpha1().ChartConfigs(cr.Namespace).Get(cr.Name, metav1.GetOptions{}) | ||
| if apierrors.IsNotFound(err) { | ||
| r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("did not find chartconfig %#q. nothing to do.", cr.Name)) | ||
| return nil |
There was a problem hiding this comment.
If there is no chartconfig CR we can stop here.
| finalizers := []string{} | ||
|
|
||
| for _, f := range chartConfig.ObjectMeta.Finalizers { | ||
| if f == "operatorkit.giantswarm.io/chart-operator-chartconfig" { |
There was a problem hiding this comment.
Once the annotation is in place we only remove the operatorkit finalizer.
| } | ||
|
|
||
| chartConfig.ObjectMeta.Finalizers = finalizers | ||
| _, err = r.g8sClient.CoreV1alpha1().ChartConfigs("giantswarm").Update(chartConfig) |
There was a problem hiding this comment.
Can we simply use patch operation to remove specific finalizers? I think we did many times before.
There was a problem hiding this comment.
True good point. I'll update to do that.
I also found a problem with getting the chartconfig CR. Some of the CR names are different as they have kubernetes- prefixes.
But they have the same app label so I'll use that instead.
|
Changes made. Tested on |
|
@tomahawk28 PTAL. Doing a final test but this should be OK now. |
|
Tested on |
* Disable chartconfig integration tests * Remove chartconfig controller * Add chartmigration resource * Get chartconfig CR from its app label and remove finalizer using JSON patch * Add app labels to migration test
Towards giantswarm/roadmap#30
Now that we only use chart CRs in new tenant clusters the only purpose of the legacy chartconfig controller is for deleting chartconfig CRs.
This is now done by a new chartmigration resource. It checks for the
chart-operator.giantswarm.io/delete-custom-resource-onlyannotation which is added by cluster-operator once the migration is complete.https://github.com/giantswarm/cluster-operator/blob/legacy/service/controller/resource/appmigration/create.go#L150-L155