Bump redskyops chart to v0.1.2

charts/redskyops/v0.1.2/Chart.yaml

 apiVersion: v1
-appVersion: v1.1.1
+appVersion: v1.2.2
 description: |
   An AIOps platform for deploying, scaling and managing containerized applications in Kubernetes environments.
 home: https://redskyops.dev/
 icon: file://../icon.png
-name: redskyops
-version: 0.1.1
 maintainers:
-- name: redskyops
-  email: info@redskyops.dev
+- email: info@redskyops.dev
+  name: redskyops
+name: redskyops
+version: 0.1.2

charts/redskyops/v0.1.2/questions.yml

@@ -15,7 +15,7 @@ questions:
     type: string
     label: Image Name
   - variable: redskyTag
-    default: "1.1.1"
+    default: "1.2.2"
     description: "Docker image tag"
     type: string
     label: Image Tag

charts/redskyops/v0.1.2/templates/bootstrap_cluster_role.yaml

+{{- if .Values.rbac.create -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ .Release.Name }}-aggregate-to-patching
+  labels:
+    "redskyops.dev/aggregate-to-patching": "true"
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - patch
+      - get
+  - apiGroups:
+      - apps
+      - extensions
+    resources:
+      - deployments
+      - statefulsets
+    verbs:
+      - patch
+      - get
+{{- end -}}

charts/redskyops/v0.1.2/templates/deployment.yaml

@@ -7,10 +7,10 @@ metadata:
     prometheus.io/scrape: "true"
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     control-plane: controller-manager
   name: "{{ .Release.Name }}-controller-manager-metrics-service"
 spec:
@@ -19,6 +19,7 @@ spec:
     port: 8443
     targetPort: https
   selector:
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/name: redskyops
     control-plane: controller-manager
 ---
@@ -29,21 +30,23 @@ metadata:
     checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     control-plane: controller-manager
   name: "{{ .Release.Name }}-controller-manager"
 spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/instance: {{ .Release.Name | quote }}
       app.kubernetes.io/name: redskyops
       control-plane: controller-manager
   template:
     metadata:
       labels:
+        app.kubernetes.io/instance: {{ .Release.Name | quote }}
         app.kubernetes.io/name: redskyops
         app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
         control-plane: controller-manager
@@ -63,7 +66,11 @@ spec:
         - --metrics-addr=127.0.0.1:8080
         command:
         - /manager
+        envFrom:
+        - secretRef:
+            name: "{{ .Release.Name }}-manager"
         image: {{ .Values.redskyImage }}:{{ .Values.redskyTag }}
+        imagePullPolicy: {{ .Values.redskyImagePullPolicy }}
         name: manager
         resources:
           limits:
@@ -78,15 +85,4 @@ spec:
           runAsGroup: 65532
           runAsNonRoot: true
           runAsUser: 65532
-        volumeMounts:
-        - mountPath: /home/nonroot
-          name: client-config
-          readOnly: true
       terminationGracePeriodSeconds: 10
-      volumes:
-      - name: client-config
-        secret:
-          items:
-          - key: client.yaml
-            path: .redsky
-          secretName: client-config

charts/redskyops/v0.1.2/templates/rbac.yaml

@@ -2,23 +2,20 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   name: "{{ .Release.Name }}-manager-role"
 rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
+  - namespaces
   verbs:
-  - get
   - list
-  - patch
 - apiGroups:
   - ""
   resources:
@@ -32,16 +29,6 @@ rules:
   verbs:
   - list
 - apiGroups:
-  - apps
-  - extensions
-  resources:
-  - deployments
-  - statefulsets
-  verbs:
-  - get
-  - list
-  - patch
-- apiGroups:
   - batch
   - extensions
   resources:
@@ -104,15 +91,31 @@ rules:
   - patch
   - update
 ---
+aggregationRule:
+  clusterRoleSelectors:
+  - matchLabels:
+      redskyops.dev/aggregate-to-patching: "true"
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+  name: "{{ .Release.Name }}-patching-role"
+rules: []
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/name: redskyops
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   name: "{{ .Release.Name }}-proxy-role"
 rules:
 - apiGroups:
@@ -133,10 +136,10 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   name: "{{ .Release.Name }}-manager-rolebinding"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -152,10 +155,29 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+  name: "{{ .Release.Name }}-patching-rolebinding"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: "{{ .Release.Name }}-patching-role"
+subjects:
+- kind: ServiceAccount
+  name: default
+  namespace: {{ .Release.Namespace | quote }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/name: redskyops
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
   name: "{{ .Release.Name }}-proxy-rolebinding"
 roleRef:
   apiGroup: rbac.authorization.k8s.io

charts/redskyops/v0.1.2/templates/secret.yaml

-{{- define "client.config" }}
-  address: {{ .Values.address | quote }}
-  oauth2:
-    client_id: {{ .Values.oauth2ClientID | quote }}
-    client_secret: {{ .Values.oauth2ClientSecret | quote }}
-    token_url: {{ .Values.oauth2TokenURL | quote }}
-{{- end }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: client-config
+  name: {{ .Release.Name }}-manager
   labels:
     app.kubernetes.io/name: redskyops
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
 type: Opaque
 data:
-  client.yaml: {{ include "client.config" . | b64enc }}
+  REDSKY_ADDRESS: {{ .Values.address | b64enc | quote }}
+  REDSKY_OAUTH2_CLIENT_ID: {{ .Values.oauth2ClientID | b64enc | quote }}
+  REDSKY_OAUTH2_CLIENT_SECRET: {{ .Values.oauth2ClientSecret | b64enc | quote }}
+  REDSKY_OAUTH2_TOKEN_URL: {{ .Values.oauth2TokenURL | b64enc | quote }}

charts/redskyops/v0.1.2/values.yaml

 # Override the Red Sky manager image name and tag
 redskyImage: "gcr.io/redskyops/k8s-experiment"
-redskyTag: "1.1.1"
+redskyTag: "1.2.2"
+redskyImagePullPolicy: "Always"
 
 # Configure the Red Sky server address
 address: ""