correcting rbac for helm chart

djkormo · Jul 10, 2022 · cc22de4 · cc22de4
1 parent a599152
commit cc22de4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/charts/go-project-operator/Chart.yaml b/charts/go-project-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.0.9
+version: 0.0.10
 # 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.0.9"
+appVersion: "0.0.10"
diff --git a/charts/go-project-operator/templates/deployment.yaml b/charts/go-project-operator/templates/deployment.yaml
@@ -2,13 +2,15 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "chart.fullname" . }}-controller-manager
+  namespace: {{  Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "chart.fullname" . }}-controller-manager
+  namespace: {{  Release.Namespace }}
   labels:
     control-plane: controller-manager
   {{- include "chart.labels" . | nindent 4 }}

diff --git a/charts/go-project-operator/templates/leader-election-rbac.yaml b/charts/go-project-operator/templates/leader-election-rbac.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "chart.fullname" . }}-leader-election-role
+  namespace: {{  Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 rules:
@@ -41,6 +42,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "chart.fullname" . }}-leader-election-rolebinding
+  namespace: {{  Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 roleRef:
@@ -50,4 +52,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: {{ .Release.Namespace }}
diff --git a/charts/go-project-operator/templates/manager-config.yaml b/charts/go-project-operator/templates/manager-config.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "chart.fullname" . }}-manager-config
+  namespace: {{  Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 data:

diff --git a/charts/go-project-operator/templates/manager-rbac.yaml b/charts/go-project-operator/templates/manager-rbac.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "chart.fullname" . }}-manager-role
+  namespace: {{ Release.Namespace }}
   labels:
   {{- include "chart.labels" . | nindent 4 }}
 rules:
@@ -171,4 +172,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: controller-manager
-  namespace: '{{ .Release.Namespace }}'
+  namespace: {{  Release.Namespace }}
diff --git a/config/samples/project_v1alpha1_project-1.yaml b/config/samples/project_v1alpha1_project-1.yaml
@@ -17,8 +17,10 @@ spec:
     hard: 
       requests.cpu: "2"
       requests.memory: 3Gi
+      requests.ephemeral-storage: 1Gi
       limits.cpu: "4"
       limits.memory: 5Gi
+      limits.ephemeral-storage: 2Gi
   # limitRange  
   limitRange:
     limits:
@@ -31,8 +33,10 @@ spec:
       default:
         cpu: "200m"
         memory: "200Mi"
+        ephemeral-storage: "2Mi"
       defaultRequest:
         cpu: "100m"
         memory: "100Mi"
+        ephemeral-storage: "1Mi"
       type: Container