removing hard coded annotation value

STollenaar · Nov 22, 2023 · 0d1286f · 0d1286f
1 parent 69ce0b5
commit 0d1286f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/api/v1alpha1/cmtemplate_types.go b/api/v1alpha1/cmtemplate_types.go
@@ -26,6 +26,7 @@ import (
 type Template struct {
 	AnnotationReplace map[string]string `json:"annotationreplace"`
 	CMTemplate        map[string]string `json:"cmtemplate"`
+	TargetAnnotation  string            `json:"targetAnnotation"`
 }
 
 // CMTemplateSpec defines the desired state of CMTemplate

diff --git a/charts/cmstate-operator/Chart.yaml b/charts/cmstate-operator/Chart.yaml
@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.2
+version: 0.2.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.2.2"
+appVersion: "0.2.3"
diff --git a/charts/cmstate-operator/templates/cmtemplates-crd.yaml b/charts/cmstate-operator/templates/cmtemplates-crd.yaml
@@ -45,9 +45,12 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  targetAnnotation:
+                    type: string
                 required:
                 - annotationreplace
                 - cmtemplate
+                - targetAnnotation
                 type: object
             type: object
           status:

diff --git a/config/crd/bases/cache.spices.dev_cmtemplates.yaml b/config/crd/bases/cache.spices.dev_cmtemplates.yaml
@@ -45,9 +45,12 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  targetAnnotation:
+                    type: string
                 required:
                 - annotationreplace
                 - cmtemplate
+                - targetAnnotation
                 type: object
             type: object
           status:

diff --git a/webhook/webhook.go b/webhook/webhook.go
@@ -151,7 +151,7 @@ func (hook *cmStateCreator) handlePodCreate(req admission.Request, cmState *cach
 		}
 	}
 
-	pod.Annotations["vault.hashicorp.com/agent-configmap"] = cmState.Name
+	pod.Annotations[cmTemplate.Spec.Template.TargetAnnotation] = cmState.Name
 
 	pData, err := json.Marshal(pod)
 	if err != nil {