Update charts and API

Signed-off-by: raihankhan <[email protected]>
kubedb · Jan 19, 2024 · 59d101c · 59d101c
1 parent 439ef4f
commit 59d101c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 77 deletions.
diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -108,7 +108,7 @@
     "2.3.2-centos"
   ],
   "Rabbitmq": [
-    "3.12"
+    "3.12.12"
   ],
   "Redis": [
     "7.2.3",

diff --git a/...og/kubedb/raw/rabbitmq/rabbitmq-3.12.yaml → ...kubedb/raw/rabbitmq/rabbitmq-3.12.12.yaml b/...og/kubedb/raw/rabbitmq/rabbitmq-3.12.yaml → ...kubedb/raw/rabbitmq/rabbitmq-3.12.12.yaml
@@ -1,12 +1,12 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: RabbitmqVersion
 metadata:
-  name: "3.12.12"
+  name: 3.12.12
 spec:
   db:
     image: ghcr.io/appscode-images/rabbitmq:3.12.12-management-alpine
   initContainer:
     image: ghcr.io/kubedb/rabbitmq-init:3.12.12
   securityContext:
     runAsUser: 1001
-  version: "3.12.12"
+  version: 3.12.12
diff --git a/charts/kubedb-catalog/README.md b/charts/kubedb-catalog/README.md
@@ -71,7 +71,7 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch
 | featureGates.PgPool                        |                                                 | <code>false</code>           |
 | featureGates.Postgres                      |                                                 | <code>true</code>            |
 | featureGates.ProxySQL                      |                                                 | <code>true</code>            |
-| featureGates.RabbitMQ                      |                                                 | <code>false</code>           |
+| featureGates.Rabbitmq                      |                                                 | <code>true</code>            |
 | featureGates.Redis                         |                                                 | <code>true</code>            |
 | featureGates.SingleStore                   |                                                 | <code>false</code>           |
 | featureGates.Solr                          |                                                 | <code>false</code>           |
@@ -97,6 +97,8 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch
 | psp.redis.privileged                       |                                                 | <code>false</code>           |
 | psp.kafka.allowPrivilegeEscalation         |                                                 | <code>false</code>           |
 | psp.kafka.privileged                       |                                                 | <code>false</code>           |
+| psp.rabbitmq.allowPrivilegeEscalation      |                                                 | <code>false</code>           |
+| psp.rabbitmq.privileged                    |                                                 | <code>false</code>           |
 | skipDeprecated                             | Set true to avoid deploying deprecated versions | <code>true</code>            |
 
 

diff --git a/...log/templates/rabbitmq/rabbitmq-3.12.yaml → .../templates/rabbitmq/rabbitmq-3.12.12.yaml b/...log/templates/rabbitmq/rabbitmq-3.12.yaml → .../templates/rabbitmq/rabbitmq-3.12.12.yaml
@@ -8,17 +8,15 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: RabbitmqVersion
 metadata:
-  name: '3.12'
+  name: '3.12.12'
   labels:
     {{- include "kubedb-catalog.labels" . | nindent 4 }}
 spec:
   db:
-    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "rabbitmq") $) }}:3.12-management'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/rabbitmq") $) }}:3.12.12-management-alpine'
   initContainer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "raihankhanraka/rabbitmq-init") $) }}:3.12'
-  podSecurityPolicies:
-    databasePolicyName: rabbitmq-db
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/rabbitmq-init") $) }}:3.12.12'
   securityContext:
     runAsUser: 1001
-  version: "3.12"
+  version: 3.12.12
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-psp.yaml b/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-psp.yaml
diff --git a/charts/kubedb-catalog/values.openapiv3_schema.yaml b/charts/kubedb-catalog/values.openapiv3_schema.yaml
@@ -119,16 +119,6 @@ properties:
         - allowPrivilegeEscalation
         - privileged
         type: object
-      rabbitmq:
-        properties:
-          allowPrivilegeEscalation:
-            type: boolean
-          privileged:
-            type: boolean
-        required:
-        - allowPrivilegeEscalation
-        - privileged
-        type: object
       redis:
         properties:
           allowPrivilegeEscalation:

diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -1648,16 +1648,6 @@ properties:
             - allowPrivilegeEscalation
             - privileged
             type: object
-          rabbitmq:
-            properties:
-              allowPrivilegeEscalation:
-                type: boolean
-              privileged:
-                type: boolean
-            required:
-            - allowPrivilegeEscalation
-            - privileged
-            type: object
           redis:
             properties:
               allowPrivilegeEscalation: