diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 305c2e59d..7ad51cef6 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -41,6 +41,9 @@ "mongodb-1.11.0", "gcs-0.13.0" ], + "MSSQL": [ + "2022-cu12" + ], "MariaDB": [ "11.2.2", "11.1.3", @@ -67,9 +70,6 @@ "percona-4.2.24", "4.2.24" ], - "MsSQL": [ - "2022-cu12" - ], "MySQL": [ "8.2.0", "8.1.0", diff --git a/catalog/kubedb/raw/mssql/mssql-2022.yaml b/catalog/kubedb/raw/mssql/mssql-2022.yaml index 21acdf31a..38082f6a4 100644 --- a/catalog/kubedb/raw/mssql/mssql-2022.yaml +++ b/catalog/kubedb/raw/mssql/mssql-2022.yaml @@ -1,5 +1,5 @@ apiVersion: catalog.kubedb.com/v1alpha1 -kind: MsSQLVersion +kind: MSSQLVersion metadata: name: 2022-cu12 spec: diff --git a/charts/kubedb-catalog/README.md b/charts/kubedb-catalog/README.md index 647820e9d..67c8b715a 100644 --- a/charts/kubedb-catalog/README.md +++ b/charts/kubedb-catalog/README.md @@ -62,6 +62,7 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch | featureGates.MariaDB | | true | | featureGates.Memcached | | true | | featureGates.MongoDB | | true | +| featureGates.MSSQL | | true | | featureGates.MySQL | | true | | featureGates.PerconaXtraDB | | true | | featureGates.PgBouncer | | true | @@ -73,7 +74,6 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch | featureGates.Singlestore | | true | | featureGates.Solr | | true | | featureGates.ZooKeeper | | true | -| featureGates.MsSQL | | true | | psp.enabled | | false | | psp.elasticsearch.allowPrivilegeEscalation | | true | | psp.elasticsearch.privileged | | true | diff --git a/charts/kubedb-catalog/crds/catalog.kubedb.com_mssqlversions.yaml b/charts/kubedb-catalog/crds/catalog.kubedb.com_mssqlversions.yaml index 496079ef6..762f6f816 100644 --- a/charts/kubedb-catalog/crds/catalog.kubedb.com_mssqlversions.yaml +++ b/charts/kubedb-catalog/crds/catalog.kubedb.com_mssqlversions.yaml @@ -11,8 +11,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLVersion - listKind: MsSQLVersionList + kind: MSSQLVersion + listKind: MSSQLVersionList plural: mssqlversions shortNames: - msversion diff --git a/charts/kubedb-catalog/templates/mssql/mssql-2022.yaml b/charts/kubedb-catalog/templates/mssql/mssql-2022.yaml index 3908f6a6f..5bb1b442d 100644 --- a/charts/kubedb-catalog/templates/mssql/mssql-2022.yaml +++ b/charts/kubedb-catalog/templates/mssql/mssql-2022.yaml @@ -3,10 +3,10 @@ {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} {{- end }} -{{ if $featureGates.MsSQL }} +{{ if $featureGates.MSSQL }} apiVersion: catalog.kubedb.com/v1alpha1 -kind: MsSQLVersion +kind: MSSQLVersion metadata: name: '2022-cu12' labels: diff --git a/charts/kubedb-catalog/values.yaml b/charts/kubedb-catalog/values.yaml index 7e879671e..c701b3b99 100644 --- a/charts/kubedb-catalog/values.yaml +++ b/charts/kubedb-catalog/values.yaml @@ -32,6 +32,7 @@ featureGates: MariaDB: true Memcached: true MongoDB: true + MSSQL: true MySQL: true PerconaXtraDB: true PgBouncer: true @@ -43,7 +44,6 @@ featureGates: Singlestore: true Solr: true ZooKeeper: true - MsSQL: true psp: enabled: false diff --git a/charts/kubedb-crd-manager/README.md b/charts/kubedb-crd-manager/README.md index 604addaa6..3e0b25168 100644 --- a/charts/kubedb-crd-manager/README.md +++ b/charts/kubedb-crd-manager/README.md @@ -75,6 +75,7 @@ The following table lists the configurable parameters of the `kubedb-crd-manager | featureGates.MariaDB | | false | | featureGates.Memcached | | false | | featureGates.MongoDB | | false | +| featureGates.MSSQL | | true | | featureGates.MySQL | | false | | featureGates.PerconaXtraDB | | false | | featureGates.PgBouncer | | false | @@ -86,7 +87,6 @@ The following table lists the configurable parameters of the `kubedb-crd-manager | featureGates.Singlestore | | false | | featureGates.Solr | | false | | featureGates.ZooKeeper | | false | -| featureGates.MsSQL | | true | | removeUnusedCRDs | | false | diff --git a/charts/kubedb-crd-manager/values.yaml b/charts/kubedb-crd-manager/values.yaml index 626ccc27b..d9c495449 100644 --- a/charts/kubedb-crd-manager/values.yaml +++ b/charts/kubedb-crd-manager/values.yaml @@ -83,6 +83,7 @@ featureGates: MariaDB: false Memcached: false MongoDB: false + MSSQL: true MySQL: false PerconaXtraDB: false PgBouncer: false @@ -94,6 +95,5 @@ featureGates: Singlestore: false Solr: false ZooKeeper: false - MsSQL: true removeUnusedCRDs: false diff --git a/charts/kubedb-crds/crds/catalog.kubedb.com_mssqlversions.yaml b/charts/kubedb-crds/crds/catalog.kubedb.com_mssqlversions.yaml index 496079ef6..762f6f816 100644 --- a/charts/kubedb-crds/crds/catalog.kubedb.com_mssqlversions.yaml +++ b/charts/kubedb-crds/crds/catalog.kubedb.com_mssqlversions.yaml @@ -11,8 +11,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLVersion - listKind: MsSQLVersionList + kind: MSSQLVersion + listKind: MSSQLVersionList plural: mssqlversions shortNames: - msversion diff --git a/charts/kubedb-crds/crds/kubedb.com_mssqls.yaml b/charts/kubedb-crds/crds/kubedb.com_mssqls.yaml index e310a1c52..d3ea72cfd 100644 --- a/charts/kubedb-crds/crds/kubedb.com_mssqls.yaml +++ b/charts/kubedb-crds/crds/kubedb.com_mssqls.yaml @@ -12,8 +12,8 @@ spec: - kubedb - appscode - all - kind: MsSQL - listKind: MsSQLList + kind: MSSQL + listKind: MSSQLList plural: mssqls shortNames: - ms diff --git a/charts/kubedb-crds/crds/ops.kubedb.com_mssqlopsrequests.yaml b/charts/kubedb-crds/crds/ops.kubedb.com_mssqlopsrequests.yaml index c8db148a1..816b4035f 100644 --- a/charts/kubedb-crds/crds/ops.kubedb.com_mssqlopsrequests.yaml +++ b/charts/kubedb-crds/crds/ops.kubedb.com_mssqlopsrequests.yaml @@ -11,8 +11,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLOpsRequest - listKind: MsSQLOpsRequestList + kind: MSSQLOpsRequest + listKind: MSSQLOpsRequestList plural: mssqlopsrequests shortNames: - msops diff --git a/charts/kubedb-ui-server/crds/kubedb.com_mssqls.yaml b/charts/kubedb-ui-server/crds/kubedb.com_mssqls.yaml index e310a1c52..d3ea72cfd 100644 --- a/charts/kubedb-ui-server/crds/kubedb.com_mssqls.yaml +++ b/charts/kubedb-ui-server/crds/kubedb.com_mssqls.yaml @@ -12,8 +12,8 @@ spec: - kubedb - appscode - all - kind: MsSQL - listKind: MsSQLList + kind: MSSQL + listKind: MSSQLList plural: mssqls shortNames: - ms diff --git a/charts/kubedb-webhook-server/README.md b/charts/kubedb-webhook-server/README.md index 5161a7dae..d8cc0bd7c 100644 --- a/charts/kubedb-webhook-server/README.md +++ b/charts/kubedb-webhook-server/README.md @@ -63,6 +63,7 @@ The following table lists the configurable parameters of the `kubedb-webhook-ser | featureGates.MariaDB | | true | | featureGates.Memcached | | false | | featureGates.MongoDB | | true | +| featureGates.MSSQL | | true | | featureGates.MySQL | | true | | featureGates.PerconaXtraDB | | true | | featureGates.PgBouncer | | true | @@ -74,7 +75,6 @@ The following table lists the configurable parameters of the `kubedb-webhook-ser | featureGates.Singlestore | | false | | featureGates.Solr | | true | | featureGates.ZooKeeper | | false | -| featureGates.MsSQL | | true | | imagePullSecrets | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace.
Example:
`helm template charts/kubedb-webhook-server \`
`--set imagePullSecrets[0].name=sec0 \`
`--set imagePullSecrets[1].name=sec1` | [] | | imagePullPolicy | Container image pull policy | IfNotPresent | | criticalAddon | If true, installs KubeDB webhook server as critical addon | false | diff --git a/charts/kubedb-webhook-server/templates/provisioner/mutating-webhook.yaml b/charts/kubedb-webhook-server/templates/provisioner/mutating-webhook.yaml index fb5d5b7c8..6d4a84ad2 100644 --- a/charts/kubedb-webhook-server/templates/provisioner/mutating-webhook.yaml +++ b/charts/kubedb-webhook-server/templates/provisioner/mutating-webhook.yaml @@ -384,7 +384,7 @@ webhooks: failurePolicy: {{ .Values.apiserver.webhook.failurePolicy }} sideEffects: None {{- end }} -{{- if $featureGates.MsSQL }} +{{- if $featureGates.MSSQL }} - name: mssqlwebhook.mutators.kubedb.com clientConfig: service: diff --git a/charts/kubedb-webhook-server/templates/provisioner/validating-webhook.yaml b/charts/kubedb-webhook-server/templates/provisioner/validating-webhook.yaml index ed99c1b81..400e3d40f 100644 --- a/charts/kubedb-webhook-server/templates/provisioner/validating-webhook.yaml +++ b/charts/kubedb-webhook-server/templates/provisioner/validating-webhook.yaml @@ -399,7 +399,7 @@ webhooks: failurePolicy: {{ .Values.apiserver.webhook.failurePolicy }} sideEffects: None {{- end }} -{{- if $featureGates.MsSQL }} +{{- if $featureGates.MSSQL }} - name: mssqlwebhook.validators.kubedb.com clientConfig: service: diff --git a/charts/kubedb-webhook-server/values.yaml b/charts/kubedb-webhook-server/values.yaml index 8a173b049..9418ce91e 100644 --- a/charts/kubedb-webhook-server/values.yaml +++ b/charts/kubedb-webhook-server/values.yaml @@ -44,6 +44,7 @@ featureGates: MariaDB: true Memcached: false MongoDB: true + MSSQL: true MySQL: true PerconaXtraDB: true PgBouncer: true @@ -55,7 +56,6 @@ featureGates: Singlestore: false Solr: true ZooKeeper: false - MsSQL: true # Specify an array of imagePullSecrets. # Secrets must be manually created in the namespace. diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md index 98400aaad..0144602b5 100644 --- a/charts/kubedb/README.md +++ b/charts/kubedb/README.md @@ -60,6 +60,7 @@ The following table lists the configurable parameters of the `kubedb` chart and | global.featureGates.MariaDB | | true | | global.featureGates.Memcached | | false | | global.featureGates.MongoDB | | true | +| global.featureGates.MSSQL | | true | | global.featureGates.MySQL | | true | | global.featureGates.PerconaXtraDB | | false | | global.featureGates.PgBouncer | | false | @@ -71,7 +72,6 @@ The following table lists the configurable parameters of the `kubedb` chart and | global.featureGates.Singlestore | | false | | global.featureGates.Solr | | false | | global.featureGates.ZooKeeper | | false | -| global.featureGates.MsSQL | | true | | global.monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | "" | | global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | {"monitoring.appscode.com/prometheus":"auto"} | | petset.enabled | If enabled, installs the petset chart | true | diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml index d2e8c15f2..7a83a9eb8 100644 --- a/charts/kubedb/values.yaml +++ b/charts/kubedb/values.yaml @@ -48,6 +48,7 @@ global: MariaDB: true Memcached: false MongoDB: true + MSSQL: true MySQL: true PerconaXtraDB: false PgBouncer: false @@ -59,7 +60,6 @@ global: Singlestore: false Solr: false ZooKeeper: false - MsSQL: true monitoring: # Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") diff --git a/crds/kubedb-catalog-crds.yaml b/crds/kubedb-catalog-crds.yaml index cbbf94f74..404d6beae 100644 --- a/crds/kubedb-catalog-crds.yaml +++ b/crds/kubedb-catalog-crds.yaml @@ -1270,8 +1270,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLVersion - listKind: MsSQLVersionList + kind: MSSQLVersion + listKind: MSSQLVersionList plural: mssqlversions shortNames: - msversion diff --git a/crds/kubedb-crds.yaml b/crds/kubedb-crds.yaml index d409fb4c6..625bd8b3b 100644 --- a/crds/kubedb-crds.yaml +++ b/crds/kubedb-crds.yaml @@ -56433,8 +56433,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLVersion - listKind: MsSQLVersionList + kind: MSSQLVersion + listKind: MSSQLVersionList plural: mssqlversions shortNames: - msversion @@ -133887,8 +133887,8 @@ spec: - kubedb - appscode - all - kind: MsSQL - listKind: MsSQLList + kind: MSSQL + listKind: MSSQLList plural: mssqls shortNames: - ms @@ -209725,8 +209725,8 @@ spec: - datastore - kubedb - appscode - kind: MsSQLOpsRequest - listKind: MsSQLOpsRequestList + kind: MSSQLOpsRequest + listKind: MSSQLOpsRequestList plural: mssqlopsrequests shortNames: - msops