[Misc] Chart: Support for CAPTenantOutput added

Update CRDs, rbac to add support for CAPTenantOutput resource.
SAP · Sep 2, 2024 · 7304886 · 7304886
1 parent 6883732
commit 7304886
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 10 deletions.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 description: Helm chart to deploy CAP Operator https://sap.github.io/cap-operator/
 name: cap-operator
-version: 0.7.0
-appVersion: 0.7.0
+version: 0.8.0
+appVersion: 0.8.0
diff --git a/chart/README.md b/chart/README.md
@@ -1,6 +1,6 @@
 # cap-operator
 
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square)
 
 Helm chart to deploy CAP Operator https://sap.github.io/cap-operator/
 

diff --git a/chart/crds/sme.sap.com_capapplications.yaml b/chart/crds/sme.sap.com_capapplications.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: capapplications.sme.sap.com
 spec:
   group: sme.sap.com

diff --git a/chart/crds/sme.sap.com_capapplicationversions.yaml b/chart/crds/sme.sap.com_capapplicationversions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: capapplicationversions.sme.sap.com
 spec:
   group: sme.sap.com
@@ -868,6 +868,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -974,6 +975,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -1055,6 +1057,8 @@ spec:
                                       properties:
                                         name:
                                           type: string
+                                        request:
+                                          type: string
                                       required:
                                       - name
                                       type: object
@@ -1172,6 +1176,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -1308,6 +1313,7 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
+                                  default: ""
                                   type: string
                               required:
                               - port
@@ -1425,6 +1431,8 @@ spec:
                                 type: integer
                               type: array
                               x-kubernetes-list-type: atomic
+                            supplementalGroupsPolicy:
+                              type: string
                             sysctls:
                               items:
                                 properties:
@@ -1493,6 +1501,7 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
+                                  default: ""
                                   type: string
                               required:
                               - port
@@ -1564,6 +1573,8 @@ spec:
                                 properties:
                                   name:
                                     type: string
+                                  request:
+                                    type: string
                                 required:
                                 - name
                                 type: object
@@ -1782,10 +1793,12 @@ spec:
                                   diskURI:
                                     type: string
                                   fsType:
+                                    default: ext4
                                     type: string
                                   kind:
                                     type: string
                                   readOnly:
+                                    default: false
                                     type: boolean
                                 required:
                                 - diskName
@@ -2145,6 +2158,13 @@ spec:
                                 required:
                                 - path
                                 type: object
+                              image:
+                                properties:
+                                  pullPolicy:
+                                    type: string
+                                  reference:
+                                    type: string
+                                type: object
                               iscsi:
                                 properties:
                                   chapAuthDiscovery:
@@ -2158,6 +2178,7 @@ spec:
                                   iqn:
                                     type: string
                                   iscsiInterface:
+                                    default: default
                                     type: string
                                   lun:
                                     format: int32
@@ -2406,13 +2427,15 @@ spec:
                                   image:
                                     type: string
                                   keyring:
+                                    default: /etc/ceph/keyring
                                     type: string
                                   monitors:
                                     items:
                                       type: string
                                     type: array
                                     x-kubernetes-list-type: atomic
                                   pool:
+                                    default: rbd
                                     type: string
                                   readOnly:
                                     type: boolean
@@ -2424,6 +2447,7 @@ spec:
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   user:
+                                    default: admin
                                     type: string
                                 required:
                                 - image
@@ -2432,6 +2456,7 @@ spec:
                               scaleIO:
                                 properties:
                                   fsType:
+                                    default: xfs
                                     type: string
                                   gateway:
                                     type: string
@@ -2449,6 +2474,7 @@ spec:
                                   sslEnabled:
                                     type: boolean
                                   storageMode:
+                                    default: ThinProvisioned
                                     type: string
                                   storagePool:
                                     type: string
@@ -3298,6 +3324,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -3404,6 +3431,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -3485,6 +3513,8 @@ spec:
                                       properties:
                                         name:
                                           type: string
+                                        request:
+                                          type: string
                                       required:
                                       - name
                                       type: object
@@ -3602,6 +3632,7 @@ spec:
                                         format: int32
                                         type: integer
                                       service:
+                                        default: ""
                                         type: string
                                     required:
                                     - port
@@ -3775,6 +3806,8 @@ spec:
                                 type: integer
                               type: array
                               x-kubernetes-list-type: atomic
+                            supplementalGroupsPolicy:
+                              type: string
                             sysctls:
                               items:
                                 properties:
@@ -3809,6 +3842,8 @@ spec:
                                 properties:
                                   name:
                                     type: string
+                                  request:
+                                    type: string
                                 required:
                                 - name
                                 type: object
@@ -4030,10 +4065,12 @@ spec:
                                   diskURI:
                                     type: string
                                   fsType:
+                                    default: ext4
                                     type: string
                                   kind:
                                     type: string
                                   readOnly:
+                                    default: false
                                     type: boolean
                                 required:
                                 - diskName
@@ -4393,6 +4430,13 @@ spec:
                                 required:
                                 - path
                                 type: object
+                              image:
+                                properties:
+                                  pullPolicy:
+                                    type: string
+                                  reference:
+                                    type: string
+                                type: object
                               iscsi:
                                 properties:
                                   chapAuthDiscovery:
@@ -4406,6 +4450,7 @@ spec:
                                   iqn:
                                     type: string
                                   iscsiInterface:
+                                    default: default
                                     type: string
                                   lun:
                                     format: int32
@@ -4654,13 +4699,15 @@ spec:
                                   image:
                                     type: string
                                   keyring:
+                                    default: /etc/ceph/keyring
                                     type: string
                                   monitors:
                                     items:
                                       type: string
                                     type: array
                                     x-kubernetes-list-type: atomic
                                   pool:
+                                    default: rbd
                                     type: string
                                   readOnly:
                                     type: boolean
@@ -4672,6 +4719,7 @@ spec:
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   user:
+                                    default: admin
                                     type: string
                                 required:
                                 - image
@@ -4680,6 +4728,7 @@ spec:
                               scaleIO:
                                 properties:
                                   fsType:
+                                    default: xfs
                                     type: string
                                   gateway:
                                     type: string
@@ -4697,6 +4746,7 @@ spec:
                                   sslEnabled:
                                     type: boolean
                                   storageMode:
+                                    default: ThinProvisioned
                                     type: string
                                   storagePool:
                                     type: string

diff --git a/chart/crds/sme.sap.com_captenantoperations.yaml b/chart/crds/sme.sap.com_captenantoperations.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: captenantoperations.sme.sap.com
 spec:
   group: sme.sap.com

diff --git a/chart/crds/sme.sap.com_captenantoutputs.yaml b/chart/crds/sme.sap.com_captenantoutputs.yaml
@@ -0,0 +1,44 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.1
+  name: captenantoutputs.sme.sap.com
+spec:
+  group: sme.sap.com
+  names:
+    kind: CAPTenantOutput
+    listKind: CAPTenantOutputList
+    plural: captenantoutputs
+    shortNames:
+    - ctout
+    singular: captenantoutput
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            type: string
+          kind:
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              subscriptionCallbackData:
+                type: string
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources: {}
diff --git a/chart/crds/sme.sap.com_captenants..yaml → chart/crds/sme.sap.com_captenants.yaml b/chart/crds/sme.sap.com_captenants..yaml → chart/crds/sme.sap.com_captenants.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: captenants.sme.sap.com
 spec:
   group: sme.sap.com

diff --git a/chart/templates/controller-rbac.yaml b/chart/templates/controller-rbac.yaml
@@ -18,7 +18,7 @@ metadata:
     operator.sme.sap.com/release: {{.Release.Name}}
 rules:
 - apiGroups: ["sme.sap.com"]
-  resources: ["capapplications", "capapplications/status", "capapplicationversions", "capapplicationversions/status", "captenants", "captenants/status", "captenantoperations", "captenantoperations/status"]
+  resources: ["capapplications", "capapplications/status", "capapplicationversions", "capapplicationversions/status", "captenants", "captenants/status", "captenantoperations", "captenantoperations/status", "captenantoutputs"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete", "deletecollection"]
 - apiGroups: [""]
   resources: ["secrets", "configmaps", "services"]

diff --git a/chart/templates/server-rbac.yaml b/chart/templates/server-rbac.yaml
@@ -18,7 +18,7 @@ metadata:
     operator.sme.sap.com/release: {{.Release.Name}}
 rules:
 - apiGroups: ["sme.sap.com"]
-  resources: ["capapplications", "capapplications/status"]
+  resources: ["capapplications", "capapplications/status", "captenantoutputs"]
   verbs:  ["get", "list", "watch"]
 - apiGroups: ["sme.sap.com"]
   resources: ["captenants", "captenants/status"]

diff --git a/chart/templates/webhook-rbac.yaml b/chart/templates/webhook-rbac.yaml
@@ -17,7 +17,7 @@ rules:
   resources: ["pods"]
   verbs: ["get", "watch", "list"]
 - apiGroups: ["sme.sap.com"]
-  resources: ["capapplications","capapplicationversions", "captenants"]
+  resources: ["capapplications","capapplicationversions", "captenants", "captenantoperations", "captenantoutputs"]
   verbs:  ["get", "list", "watch", "create", "update", "patch", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1