diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index caf29b0..54887d1 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -77,6 +77,12 @@ releases: namespace: database-service createNamespace: true + - <<: *mysql + installed: true + namespace: database-service + createNamespace: true + + bases: - ../environments.yaml - ../repositories.yaml diff --git a/badhouseplants/values/secrets.db-instances.yaml b/badhouseplants/values/secrets.db-instances.yaml index 4018bea..0bbdbe7 100644 --- a/badhouseplants/values/secrets.db-instances.yaml +++ b/badhouseplants/values/secrets.db-instances.yaml @@ -3,6 +3,10 @@ dbinstances: secrets: adminUser: ENC[AES256_GCM,data:pKbAQDiOs6k=,iv:yET0mJtdm2baDJHwq1uYEoxye48g2PrMqiOSO3POTBo=,tag:wuIxhHiRzjSRM+uaEo2KNQ==,type:str] adminPassword: ENC[AES256_GCM,data:/U3q6RmOYLpxJBAYsJ8f4lV3MB0=,iv:dw7g0E4Gm0YqtgvdcC+bq+YbSRPop3BKLiJfwaz+1io=,tag:NAXnWj4AjgajN94ml/ENsA==,type:str] + mysql: + secrets: + adminUser: ENC[AES256_GCM,data:XFEGew==,iv:7aj2J7Qs9mHC5kRZGrg71hwEBP64vEz0qQ+qoPHSgrc=,tag:/Rx5yx7iMU5Gwcmbf5GVSg==,type:str] + adminPassword: ENC[AES256_GCM,data:vYIiHccMkX7yJ2gsVGcLTUO7Ers=,iv:uDlefG5I/cirIUal/phlHCNwYtcXYFBND54XJ+n7eug=,tag:YK7pdaohOZL9yg4OiPxbRg==,type:str] sops: kms: [] gcp_kms: [] @@ -18,8 +22,8 @@ sops: Wmh3Z29ZSlBhbmFJNkFQZlE3aXpMMk0K14rSXjSF08xkil+fFJpeMV+6XChTJ2/3 OQecJtg+0NQPyvC+kR5qKq8roiSzNNJgTVg2wwKMdukKVVTbEGi0gA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-07-21T14:01:22Z" - mac: ENC[AES256_GCM,data:tH/XnZOmYYygzMEcJduyCX3qXX5t8vEIwh4PwXXpsgfUvM7kKzbEEMDq4vyxIO5ht7ixXs8HRVKC2hK8Jn4d9/theXXTaxxeZvtUK23og01S5kyRJdlJpx5J3+soHKlkegbSH4JiQPRNgO7rf1PFIM6n++KtFvnBkrDdYD1c6Pw=,iv:VOiVwRRrqAp6fLjxGnZ0hvFxqOFrhgKu8lom2MrtDnw=,tag:+OjBhUpvplsLzRFrScmPJA==,type:str] + lastmodified: "2023-07-30T15:07:28Z" + mac: ENC[AES256_GCM,data:/q/LG+CgBAm666nwu+QCw9beoC8m11R5OYspnUxdwTfAv4h0yqY0Hk599hy+Yqt0brpUpj8hwqCESkt6gufFAklilSYV8SWvea7FxA4Jdbfpj1kfty9d4qMxHrpggId/jPshVAVsF0Ezh1/XbPWpQnTiaAMu2JTVMR9cFR3xvyc=,iv:37EdIo9QoUemTvpHSKD2kdq1FnJpwNXGr8ym0dPX6w8=,tag:ri2ILtd9FvLJf0O5iKOdyg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/badhouseplants/values/secrets.mysql.yaml b/badhouseplants/values/secrets.mysql.yaml new file mode 100644 index 0000000..52fd510 --- /dev/null +++ b/badhouseplants/values/secrets.mysql.yaml @@ -0,0 +1,23 @@ +auth: + rootPassword: ENC[AES256_GCM,data:X7htluDDokepRf8GVV4eu+pGM2o=,iv:DJ893dKr/4SFBEl8HnYv2PMb3Nb2AfL1RVgN2QmDRmA=,tag:W6QX7k92P7bgi3Ji/64xHg==,type:str] + password: ENC[AES256_GCM,data:hlXWCWbFnmbuUg==,iv:d9ZmklpwJa13wyNjrqNfFMEbJDSQ+NeyB4gj+59g09Q=,tag:Ps4oq5XWDIx7HnvCCnB/FQ==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVbENvMm1YQzlSV3UrSEJ4 + VTZ1RWVKTlpsUDFzQlVjMlJEZmIvaldHVXlFCm9SVzN3Z0dwTGo1Y3dnaHhvSmpi + bDIrMlJhbHhKUmRZejdkTmJiSDYvY2MKLS0tIFpRbkwySVh2MDlNWEFNZHVtY2Ns + Wmh3Z29ZSlBhbmFJNkFQZlE3aXpMMk0K14rSXjSF08xkil+fFJpeMV+6XChTJ2/3 + OQecJtg+0NQPyvC+kR5qKq8roiSzNNJgTVg2wwKMdukKVVTbEGi0gA== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2023-07-30T15:06:09Z" + mac: ENC[AES256_GCM,data:oiigjlyNoSm5hcdB58MWUxhqcYzE5XtA5LEDUCUX4r0inNd8UuLP029jz6bvQ7E/wFpiGNVTFAlFB1HA/YVwai/siovy5H2DL6g4LS3k+fxLKc3lwo3BvkaBi9X2aYu7vGBJpNe3KxBdWFyjkEQVoux1RD8JJBYNquMu9tW3K/g=,iv:1H7pF0Tr6GcgDt9ItXiTBOTFa55wb9pOdTF3jNJlPiY=,tag:dQ9nrAKr+qo4JpqD2wJXjg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/badhouseplants/values/values.db-instances.yaml b/badhouseplants/values/values.db-instances.yaml index c03513c..fbf15f5 100644 --- a/badhouseplants/values/values.db-instances.yaml +++ b/badhouseplants/values/values.db-instances.yaml @@ -10,3 +10,13 @@ dbinstances: generic: host: postgres-postgresql port: 5432 + mysql: + monitoring: + enabled: false + adminSecretRef: + Name: mysql-secret + Namespace: database-service + engine: mysql + generic: + host: mysql + port: 3306 diff --git a/badhouseplants/values/values.mysql.yaml b/badhouseplants/values/values.mysql.yaml new file mode 100644 index 0000000..d8519fb --- /dev/null +++ b/badhouseplants/values/values.mysql.yaml @@ -0,0 +1,7 @@ +primary: + persistence: + size: 500Mi + +auth: + createDatabase: false + \ No newline at end of file diff --git a/badhouseplants/values/values.nrodionov.yaml b/badhouseplants/values/values.nrodionov.yaml index 1e4c1bb..7798c6b 100644 --- a/badhouseplants/values/values.nrodionov.yaml +++ b/badhouseplants/values/values.nrodionov.yaml @@ -13,6 +13,11 @@ istio: service: nrodionov-wordpress port: 8080 +ext-database: + enabled: true + name: nrodionov-mysql + instance: mysql + wordpressBlogName: Николай Николаевич Родионов wordpressUsername: admin wordpressFirstName: Nikolai diff --git a/releases.yaml b/releases.yaml index d658945..8cb6e46 100644 --- a/releases.yaml +++ b/releases.yaml @@ -221,6 +221,7 @@ templates: - template: default-env-values - template: default-env-secrets - template: ext-istio-resource + - template: ext-database minio: &minio name: minio @@ -306,3 +307,11 @@ templates: inherit: - template: default-env-values - template: default-env-secrets + + mysql: &mysql + name: mysql + chart: bitnami/mysql + version: 9.10.9 + inherit: + - template: default-env-values + - template: default-env-secrets