diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go index 0dc674374..a05fa494f 100644 --- a/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -2323,8 +2323,6 @@ func (in *PSP) DeepCopyInto(out *PSP) { out.Proxysql = in.Proxysql out.Redis = in.Redis out.Kafka = in.Kafka - out.KafkaConnector = in.KafkaConnector - out.Rabbitmq = in.Rabbitmq return } @@ -2482,22 +2480,6 @@ func (in *PSPProxysql) DeepCopy() *PSPProxysql { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *PSPRabbitmq) DeepCopyInto(out *PSPRabbitmq) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PSPRabbitmq. -func (in *PSPRabbitmq) DeepCopy() *PSPRabbitmq { - if in == nil { - return nil - } - out := new(PSPRabbitmq) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PSPRedis) DeepCopyInto(out *PSPRedis) { *out = *in diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index d42f21af6..4f43eeb86 100644 --- 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/catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.yaml b/catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.12.yaml similarity index 86% rename from catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.yaml rename to catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.12.yaml index 7bfe329e5..3b0268780 100644 --- a/catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.yaml +++ b/catalog/kubedb/raw/rabbitmq/rabbitmq-3.12.12.yaml @@ -1,7 +1,7 @@ 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 @@ -9,4 +9,4 @@ spec: 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 index e821b9fa2..4ac4c7128 100644 --- 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 | | false | | featureGates.Postgres | | true | | featureGates.ProxySQL | | true | -| featureGates.RabbitMQ | | false | +| featureGates.Rabbitmq | | true | | featureGates.Redis | | true | | featureGates.SingleStore | | false | | featureGates.Solr | | false | @@ -97,6 +97,8 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch | psp.redis.privileged | | false | | psp.kafka.allowPrivilegeEscalation | | false | | psp.kafka.privileged | | false | +| psp.rabbitmq.allowPrivilegeEscalation | | false | +| psp.rabbitmq.privileged | | false | | skipDeprecated | Set true to avoid deploying deprecated versions | true | diff --git a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-3.12.yaml b/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-3.12.12.yaml similarity index 58% rename from charts/kubedb-catalog/templates/rabbitmq/rabbitmq-3.12.yaml rename to charts/kubedb-catalog/templates/rabbitmq/rabbitmq-3.12.12.yaml index 3d41b0f96..3e3398ada 100644 --- a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-3.12.yaml +++ b/charts/kubedb-catalog/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 deleted file mode 100644 index 519c28811..000000000 --- a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-psp.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{ $featureGates := .Values.featureGates }} -{{- if .Values.global }} - {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} -{{- end }} - -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Rabbitmq }} -apiVersion: policy/v1beta1 -kind: PodSecurityPolicy -metadata: - name: 'rabbitmq-db' - labels: - {{- include "kubedb-catalog.labels" . | nindent 4 }} -spec: - allowPrivilegeEscalation: {{ .Values.psp.rabbitmq.allowPrivilegeEscalation }} - privileged: {{ .Values.psp.rabbitmq.privileged }} - fsGroup: - rule: RunAsAny - hostIPC: false - hostNetwork: false - hostPID: false - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - '*' -{{ end }} diff --git a/charts/kubedb-catalog/values.openapiv3_schema.yaml b/charts/kubedb-catalog/values.openapiv3_schema.yaml index 8a02a95e0..86bbead08 100644 --- 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 index 2659ded89..02ffb5063 100644 --- 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: