Merge pull request #101 from cedricmckinnie/disable_apparmor

Disable AppArmor
redhat-cop · Nov 18, 2022 · 5d9f1d2 · 5d9f1d2
2 parents b2cf63d + 74036fa
commit 5d9f1d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/api/v1alpha1/keepalivedgroup_types.go b/api/v1alpha1/keepalivedgroup_types.go
@@ -60,6 +60,9 @@ type KeepalivedGroupSpec struct {
 	// +optional
 	UnicastEnabled bool `json:"unicastEnabled,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	// +mapType=granular
+	DaemonsetPodAnnotations map[string]string `json:"daemonsetPodAnnotations,omitempty"`
 }
 
 // PasswordAuth references a Kubernetes secret to extract the password for VRRP authentication

diff --git a/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml b/config/crd/bases/redhatcop.redhat.io_keepalivedgroups.yaml
@@ -41,6 +41,11 @@ spec:
                   type: integer
                 type: array
                 x-kubernetes-list-type: set
+              daemonsetPodAnnotations:
+                additionalProperties:
+                  type: string
+                type: object
+                x-kubernetes-map-type: granular
               image:
                 default: registry.redhat.io/openshift4/ose-keepalived-ipfailover
                 description: //+kubebuilder:validation:Optional

diff --git a/config/templates/keepalived-template.yaml b/config/templates/keepalived-template.yaml
@@ -12,6 +12,12 @@
         keepalivedGroup: {{ .KeepalivedGroup.ObjectMeta.Name }}
     template:
       metadata:
+      {{- with .KeepalivedGroup.Spec.DaemonsetAnnotations }}
+        annotations:
+        {{ range $index, $element := . }}
+          {{ $index }}: {{ $element }}
+        {{ end }}
+      {{- end }}
         labels:
           keepalivedGroup: {{ .KeepalivedGroup.ObjectMeta.Name }}
       spec: