Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[charts/portal ]Chart changes to upgrade the demo mysql chart to support mysql 8.4.4 #352

Merged
merged 4 commits into from
Feb 19, 2025
Merged

[charts/portal ]Chart changes to upgrade the demo mysql chart to support mysql 8.4.4 #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc40f74
Chart changes to upgrade the demo mysql chart to support mysql versio…
ksaladi Feb 9, 2025
d1adbbb
Merge branch 'develop/portal' of https://github.com/CAAPIM/apim-chart…
ksaladi Feb 17, 2025
5db1d22
More changes for mySQL container
ksaladi Feb 18, 2025
4317bb3
Adding mysql to the db_host
ksaladi Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/druid/templates/coordinator/coordinator-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
MINIO_BUCKET: {{ .Values.minio.bucketName }}
DATABASE_TYPE: {{ required "Please fill in databaseType in values.yaml" .Values.global.databaseType | quote }}
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/druid/templates/ingestion/ingestion-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data:
PARTITION_COUNT: "{{ .Values.ingestion.config.partitionCount }}"
REPLICATION_COUNT: "{{ .Values.kafka.replicaCount }}"
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
6 changes: 3 additions & 3 deletions charts/portal/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ dependencies:
version: 1.0.15
- name: mysql
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 10.3.0
version: 12.2.2
- name: rabbitmq
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 12.0.3
- name: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx/
version: 4.12.0
digest: sha256:c51ae549fe4a7429c9b262af14863a630179a58a83d6748026928c015edbcfcc
generated: "2025-02-12T17:13:19.3587419+05:30"
digest: sha256:3e796ef32aa794a28e20612262e6169a05ca45d22236ca0104de7f6ede5aed5d
generated: "2025-02-17T15:59:45.9451573+05:30"
2 changes: 1 addition & 1 deletion charts/portal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
condition: portal.analytics.enabled
repository: "file://../druid"
- name: mysql
version: 10.3.0
version: 12.2.2
repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
condition: global.setupDemoDatabase
- name: rabbitmq
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ This Chart deploys the Layer7 API Developer Portal on a Kubernetes Cluster using
Solutions & Patches](https://techdocs.broadcom.com/us/product-content/recommended-reading/technical-document-index/ca-api-developer-portal-solutions-and-patches.html) page.

### Production
- A dedicated MySQL 8.0.31/8.0.33/8.0.34/8.0.37/8.0.39 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html)
- A dedicated MySQL 8.0.31/8.0.33/8.0.34/8.0.37/8.0.39/8.4.4 server [See TechDocs for more information](https://techdocs.broadcom.com/us/en/ca-enterprise-software/layer7-api-management/api-developer-portal/5-3/install-configure-and-upgrade/install-portal-on-docker-swarm/configure-an-external-database.html)
- 3 Worker nodes with at least 4vcpu and 32GB ram - High Availability with analytics
- Access to a DNS Server
- Signed SSL Server Certificate
Expand Down Expand Up @@ -860,7 +860,7 @@ The following table lists the configured parameters of the MySQL Subchart - http

| Parameter | Description | Default |
| ----------------------------- | ----------------------------------- | ----------------------------------------------------------- |
| `mysql.image.tag` | MySQL Image to use | `8.0.37-debian-12-r2` |
| `mysql.image.tag` | MySQL Image to use | `8.4.4-debian-12-r0` |
| `mysql.auth.username` | MySQL Username | `admin` |
| `mysql.auth.existingSecret` | Secret where credentials are stored, see global.databaseSecret | `database-secret` |
| `mysql.initdbScripts` | Dictionary of initdb scripts | `see values.yaml` |
Expand Down
Binary file modified charts/portal/charts/druid-1.0.15.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed charts/portal/charts/mysql-10.3.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added charts/portal/charts/mysql-12.2.2.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/portal/templates/analytics-server/analytics-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data:
BROKER_PORT: "8082"
ANALYTICS_ENABLED: {{ .Values.portal.analytics.enabled | quote }}
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/templates/apim/apim-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/templates/authenticator/authenticator-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
CASSO_DEBUG_ENABLED: {{ required "Please fill in ssoDebug in values.yaml" .Values.portal.ssoDebug | quote}}
CASSO_ENABLED: "true"
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/templates/jobs/db-upgrade-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
env:
- name: HOST
{{ if .Values.global.setupDemoDatabase }}
value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
value: {{ .Release.Name }}-mysql-headless
{{ else }}
value: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/templates/jobs/rbac-upgrade-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
env:
- name: HOST
{{ if .Values.global.setupDemoDatabase }}
value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
value: {{ .Release.Name }}-mysql-headless
{{ else }}
value: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/templates/portal-data/portal-data-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
RBAC_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
Expand Down
6 changes: 3 additions & 3 deletions charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ if .Values.global.setupDemoDatabase}}
ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
SEARCH_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
RBAC_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
SEARCH_DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
ENTERPRISE_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
APIM_PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain }}
BUSINESS_REPORTS_ENABLED: "false"
{{ if .Values.global.setupDemoDatabase}}
DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
DATABASE_HOST: {{ .Release.Name }}-mysql-headless
{{ else }}
DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
{{ end }}
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/values-production.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ jobs:
# MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
mysql:
image:
tag: "8.0.37-debian-12-r2"
tag: "8.4.4-debian-12-r0"
auth:
username: portal
existingSecret: database-secret
Expand All @@ -962,7 +962,7 @@ mysql:
default-character-set=utf8mb4
plugin_dir=/opt/bitnami/mysql/plugin
[mysqld]
default_authentication_plugin=mysql_native_password
mysql_native_password=ON
skip-name-resolve
explicit_defaults_for_timestamp
basedir=/opt/bitnami/mysql
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ jobs:
# MySQL Stable Chart values - https://github.com/bitnami/charts/tree/master/bitnami/mysql
mysql:
image:
tag: "8.0.37-debian-12-r2"
tag: "8.4.4-debian-12-r0"
auth:
username: portal
existingSecret: database-secret
Expand All @@ -816,7 +816,7 @@ mysql:
default-character-set=utf8mb4
plugin_dir=/opt/bitnami/mysql/plugin
[mysqld]
default_authentication_plugin=mysql_native_password
mysql_native_password=ON
skip-name-resolve
explicit_defaults_for_timestamp
basedir=/opt/bitnami/mysql
Expand Down