fix charts and rbac to pass e2e tests

Signed-off-by: Ryotaro Banno <[email protected]>
cybozu-go · Oct 30, 2024 · f6689e2 · f6689e2
1 parent 15474e7
commit f6689e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/charts/mantle-cluster-wide/templates/clusterrole.yaml b/charts/mantle-cluster-wide/templates/clusterrole.yaml
@@ -31,6 +31,7 @@ rules:
       - batch
     resources:
       - cronjobs
+      - jobs
     verbs:
       - create
       - delete

diff --git a/charts/mantle/templates/deployment.yaml b/charts/mantle/templates/deployment.yaml
@@ -76,6 +76,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: POD_IMAGE
+              value: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           ports:
             {{- toYaml .Values.controller.ports | nindent 12 }}
         - command:

diff --git a/charts/mantle/values.yaml b/charts/mantle/values.yaml
@@ -25,6 +25,15 @@ affinity: {}
 controller:
   role: standalone
   ports: []
+  #mantleServiceEndpoint:
+  #overwriteMBCSchedule:
+  #maxExportJobs:
+  #exportDataStorageClass:
+  #envSecret:
+  #objectStorageBucketName:
+  #objectStorageEndpoint:
+  #caCertConfigMap:
+  #caCertKey:
 
 secondaryService:
   # type:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -31,6 +31,7 @@ rules:
   - batch
   resources:
   - cronjobs
+  - jobs
   verbs:
   - create
   - delete

diff --git a/internal/controller/mantlebackup_controller.go b/internal/controller/mantlebackup_controller.go
@@ -298,6 +298,7 @@ func (r *MantleBackupReconciler) expire(ctx context.Context, backup *mantlev1.Ma
 //+kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch
 //+kubebuilder:rbac:groups="",resources=persistentvolumes,verbs=get;list;watch
 //+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=get;list;watch
+//+kubebuilder:rbac:groups="batch",resources=jobs,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.