diff --git a/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml b/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml index c194fc97d..b42a9425d 100644 --- a/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml +++ b/framework/app-service/.olares/config/cluster/deploy/appservice_deploy.yaml @@ -170,7 +170,7 @@ spec: priorityClassName: "system-cluster-critical" containers: - name: app-service - image: beclab/app-service:0.4.12 + image: beclab/app-service:0.4.13 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/platform/kubeblocks/.olares/config/cluster/deploy/kubeblocks-addon.yaml b/platform/kubeblocks/.olares/config/cluster/deploy/kubeblocks-addon.yaml index 7731737a3..3e4667941 100644 --- a/platform/kubeblocks/.olares/config/cluster/deploy/kubeblocks-addon.yaml +++ b/platform/kubeblocks/.olares/config/cluster/deploy/kubeblocks-addon.yaml @@ -93,4 +93,27 @@ spec: chartsImage: beclab/kubeblock-addon-charts:v1.0.1 installable: autoInstall: true + type: Helm +--- +apiVersion: extensions.kubeblocks.io/v1alpha1 +kind: Addon +metadata: + annotations: + addon.kubeblocks.io/kubeblocks-version: '>=0.9.0' + labels: + addon.kubeblocks.io/model: RDBMS + addon.kubeblocks.io/name: mariadb + addon.kubeblocks.io/provider: community + addon.kubeblocks.io/version: 1.0.1 + name: mariadb +spec: + defaultInstallValues: + - enabled: true + description: MariaDB is a high performance open source relational database management + system that is widely used for web and application servers + helm: + chartLocationURL: file:///mariadb-1.0.1.tgz + chartsImage: beclab/kubeblock-addon-charts:v1.0.1 + installable: + autoInstall: true type: Helm \ No newline at end of file diff --git a/platform/tapr/.olares/config/cluster/crds/apr.bytetrade.io_middlewarerequests.yaml b/platform/tapr/.olares/config/cluster/crds/apr.bytetrade.io_middlewarerequests.yaml index 326b45b0b..aa89ed5a2 100644 --- a/platform/tapr/.olares/config/cluster/crds/apr.bytetrade.io_middlewarerequests.yaml +++ b/platform/tapr/.olares/config/cluster/crds/apr.bytetrade.io_middlewarerequests.yaml @@ -103,6 +103,55 @@ spec: - indexes - user type: object + mariadb: + properties: + databases: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + password: + properties: + value: + description: Defaults to "". + type: string + valueFrom: + description: Source for the environment variable's value. + Cannot be used if value is not empty. + properties: + secretKeyRef: + description: Selects a key of a secret in the pod's namespace + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: |- + Name of the referent. + More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid? + type: string + optional: + description: Specify whether the Secret or its key + must be defined + type: boolean + required: + - key + type: object + x-kubernetes-map-type: atomic + type: object + type: object + user: + type: string + required: + - databases + - user + type: object middleware: type: string minio: diff --git a/platform/tapr/.olares/config/cluster/deploy/middleware_deploy.yaml b/platform/tapr/.olares/config/cluster/deploy/middleware_deploy.yaml index 37ec12b78..eb8761fab 100644 --- a/platform/tapr/.olares/config/cluster/deploy/middleware_deploy.yaml +++ b/platform/tapr/.olares/config/cluster/deploy/middleware_deploy.yaml @@ -57,7 +57,7 @@ spec: path: '{{ $dbbackup_rootpath }}/pg_backup' containers: - name: operator-api - image: beclab/middleware-operator:0.2.17 + image: beclab/middleware-operator:0.2.18 imagePullPolicy: IfNotPresent ports: - containerPort: 9080