fix: inject-ca-from is not correctly generated

In the previous version, $(namespace)/$(chartname)- will be trimmed from
cert name.  However, appMeta.ChartName() is always "charts" so that the
cert name is not correctly trimmed.

This commit fixes the issue by using appMeta.TrimName() to trim
$(chartname), like other processors.

Signed-off-by: Shang-Wen Wang (Sam Wang) <[email protected]>

Author: holyspectral

pkg/processor/crd/crd.go

@@ -58,7 +58,8 @@ func (c crd) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 	if err != nil {
 		return true, nil, errors.Wrap(err, "unable get crd certName")
 	}
-	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/"+appMeta.ChartName()+"-")
+	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/")
+	certName = appMeta.TrimName(certName)
 
 	specUnstr, ok, err := unstructured.NestedMap(obj.Object, "spec")
 	if err != nil || !ok {

pkg/processor/webhook/mutating.go

@@ -64,7 +64,8 @@ func (w mwh) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 	if err != nil {
 		return true, nil, errors.Wrap(err, "unable get webhook certName")
 	}
-	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/"+appMeta.ChartName()+"-")
+	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/")
+	certName = appMeta.TrimName(certName)
 	res := fmt.Sprintf(mwhTempl, appMeta.ChartName(), name, certName, string(webhooks))
 	return true, &mwhResult{
 		name: name,

pkg/processor/webhook/validating.go

@@ -64,7 +64,8 @@ func (w vwh) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured
 	if err != nil {
 		return true, nil, errors.Wrap(err, "unable get webhook certName")
 	}
-	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/"+appMeta.ChartName()+"-")
+	certName = strings.TrimPrefix(certName, appMeta.Namespace()+"/")
+	certName = appMeta.TrimName(certName)
 	res := fmt.Sprintf(vwhTempl, appMeta.ChartName(), name, certName, string(webhooks))
 	return true, &vwhResult{
 		name: name,

test_data/k8s-operator-kustomize.output

@@ -9,7 +9,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
+    cert-manager.io/inject-ca-from: my-operator-system/my-operator-serving-cert
   creationTimestamp: null
   name: cephvolumes.test.example.com
   labels:
@@ -230,7 +230,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
+    cert-manager.io/inject-ca-from: my-operator-system/my-operator-serving-cert
   creationTimestamp: null
   name: manifestcephvolumes.test.example.com
 spec:
@@ -676,7 +676,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
+    cert-manager.io/inject-ca-from: my-operator-system/my-operator-serving-cert
   name: my-operator-validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -756,7 +756,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: my-operator-system/operator-serving-cert
+    cert-manager.io/inject-ca-from: my-operator-system/my-operator-serving-cert
   name: my-operator-mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions: