Add helm secrets for postgresql-ha

DiamondLightSource · Mar 14, 2024 · 0e25a1f · 0e25a1f
1 parent a8fd852
commit 0e25a1f
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 80 deletions.
diff --git a/charts/xchemlab/charts/compound-library/templates/_helpers.tpl b/charts/xchemlab/charts/compound-library/templates/_helpers.tpl
@@ -68,6 +68,8 @@ Create the database URL string
 {{- $host_parts := urlParse .Values.database.host }}
 {{- $raw_user_info := printf "%s:$DATABASE_PASSWORD" .Values.database.user }}
 {{- $url_parts := set $host_parts "userinfo" $raw_user_info }}
+{{- $host := printf "%s-%s" .Release.Name (index $url_parts "host") }}
+{{- $url_parts := set $url_parts "host" $host }}
 {{- $raw_database_url := urlJoin $url_parts }}
 {{- replace "$DATABASE_PASSWORD" "$(DATABASE_PASSWORD)" $raw_database_url }}
 {{- end }}
diff --git a/charts/xchemlab/charts/compound-soaking/templates/_helpers.tpl b/charts/xchemlab/charts/compound-soaking/templates/_helpers.tpl
@@ -68,6 +68,8 @@ Create the database URL string
 {{- $host_parts := urlParse .Values.database.host }}
 {{- $raw_user_info := printf "%s:$DATABASE_PASSWORD" .Values.database.user }}
 {{- $url_parts := set $host_parts "userinfo" $raw_user_info }}
+{{- $host := printf "%s-%s" .Release.Name (index $url_parts "host") }}
+{{- $url_parts := set $url_parts "host" $host }}
 {{- $raw_database_url := urlJoin $url_parts }}
 {{- replace "$DATABASE_PASSWORD" "$(DATABASE_PASSWORD)" $raw_database_url }}
 {{- end }}
diff --git a/charts/xchemlab/charts/crystal-library/templates/_helpers.tpl b/charts/xchemlab/charts/crystal-library/templates/_helpers.tpl
@@ -68,6 +68,8 @@ Create the database URL string
 {{- $host_parts := urlParse .Values.database.host }}
 {{- $raw_user_info := printf "%s:$DATABASE_PASSWORD" .Values.database.user }}
 {{- $url_parts := set $host_parts "userinfo" $raw_user_info }}
+{{- $host := printf "%s-%s" .Release.Name (index $url_parts "host") }}
+{{- $url_parts := set $url_parts "host" $host }}
 {{- $raw_database_url := urlJoin $url_parts }}
 {{- replace "$DATABASE_PASSWORD" "$(DATABASE_PASSWORD)" $raw_database_url }}
 {{- end }}
diff --git a/charts/xchemlab/charts/pin-packing/templates/_helpers.tpl b/charts/xchemlab/charts/pin-packing/templates/_helpers.tpl
@@ -68,6 +68,8 @@ Create the database URL string
 {{- $host_parts := urlParse .Values.database.host }}
 {{- $raw_user_info := printf "%s:$DATABASE_PASSWORD" .Values.database.user }}
 {{- $url_parts := set $host_parts "userinfo" $raw_user_info }}
+{{- $host := printf "%s-%s" .Release.Name (index $url_parts "host") }}
+{{- $url_parts := set $url_parts "host" $host }}
 {{- $raw_database_url := urlJoin $url_parts }}
 {{- replace "$DATABASE_PASSWORD" "$(DATABASE_PASSWORD)" $raw_database_url }}
 {{- end }}
diff --git a/charts/xchemlab/charts/targeting/templates/_helpers.tpl b/charts/xchemlab/charts/targeting/templates/_helpers.tpl
@@ -68,6 +68,8 @@ Create the database URL string
 {{- $host_parts := urlParse .Values.database.host }}
 {{- $raw_user_info := printf "%s:$DATABASE_PASSWORD" .Values.database.user }}
 {{- $url_parts := set $host_parts "userinfo" $raw_user_info }}
+{{- $host := printf "%s-%s" .Release.Name (index $url_parts "host") }}
+{{- $url_parts := set $url_parts "host" $host }}
 {{- $raw_database_url := urlJoin $url_parts }}
 {{- replace "$DATABASE_PASSWORD" "$(DATABASE_PASSWORD)" $raw_database_url }}
 {{- end }}
diff --git a/charts/xchemlab/templates/application-secret-sealed.yaml b/charts/xchemlab/templates/application-secret-sealed.yaml
diff --git a/charts/xchemlab/templates/application-secret.yaml b/charts/xchemlab/templates/application-secret.yaml
@@ -0,0 +1,14 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: application-passwords
+  namespace: xchemlab
+spec:
+  encryptedData:
+    passwords: AgCALIOXYoCZlI3qJHUwxAGlCF5T2RqhzRGJ6WILt/feRkKdwkicFpCpdjbkLoZMutgIFbmSZtCxUopvocUTVVvy08thDwy/Vuc/tpVhGuKqGbhf7YB8Kohy4lXKfNQjuyIlIlrKlp2EvweNDC2czBwkKP2IKNcBjwO66CyE8JNUuva15UdVA+PrEeaQ+9t5bQclGafYoPnAfh/JBDVdUoHu5UESDycyXTl6IA6jXhgckXuN4mRfrkdXxJgpob2DQCmGDj8d6QBhsNjhYaJJVkK3wr3hbdHvsZGzRMsrZEeNgYGKjBkAyRxgBQqWJITA25yQIi+oWiCW0plkQZw0zEzIDH5ZP85gWCTksY/kBbSW0oaSfdIOj/6X/WpEhfjowEX99pyr6zeYCC+JvXMx/PfkkwbVdevWC4IydXXUi+kctPgBk0Cww12+vGk2u22u0tHX6QpyWcmvETlHHC13oJta/K6CdHbRtyBpnyVORwMYuIuc+gh3BSAzIlYekzWp+/998/0uywg1PUBR7TbpbZyyEFZb2ShYaqYajV7YeYP72wAG3NjvIRQAa4cyk5iXVms/hHKED5IqveeJf88ksrvdmeTqoSdTlxCaixDgyhUzaLIv6ZPv9olFS6k5IyWZ20bwjm4cPGlq5MHs6buDIRZYWs2pXIGuhA8PWByaptWtCJQWB2jOfCzUdSv0+gYjIAJOe525moLuBDUbT9YpDmH3
+    usernames: AgCQwvol+C036DNxeVfjDDtfr1LQcl+CI9R/ZjOJ/5Ctx5yawz3Xnv8AfIpvDR79+wFLkXwwng2vY3rSw462Cjj/X5FxHqzqkp9S2bNV8SlG5cb8X9wYoFrqvOq5IPDJv+HgwIdAv15kgBnT1eBr23FGovBa4TasfKQIF63DD2xx4xKsUllkXr9MrdmOz/dgtyJxwPLDE2DtTVD71IXvFucLavr6oFXCKIJ12NR556hKE1xdZZgKaNnJeLil33KA5P1MiQ8tXrco1aPbUqZ5JB2FPF3wNxW6Wmw/AeptT3QJj6QObYdSEM4/HGB+zxHEvRAXrk+9CwFZ+w57fODnDffghxrPkReFmWKLOiXBPB8YqVz5MPK8fpPMPVrFcG4YPy03LHJtboaTs1Slk0O+HxzQeeA0BOrl6Uy9TmNxZIOt202jbrkGhtLhJJnAZFfr4vrhdmALF7+aAAkDeVTF0nycCnnmo2ZHGrvlIK02PaphhGw6iuLR+8/efZNl8IErVIehwCH9+u0sIik7+FwPYNlpYeRcNmsQoJmJuy1avyowcDnHInf57s+ZlAxKbbjUX/EIO5ebuoT45kLV5MpeDIQbYS77fg3SRdaMO3OnMEv2WwYc6Tg+N8q89UAk6wqqu0VEVfng39hg/tZQmKb9O4oCosFSdobFC9I3Kf49Qh8/N4FnfaPYRWsjf6zVCVwz+hGbkmqhadv7gA==
+  template:
+    metadata:
+      creationTimestamp: null
+      name: application-passwords
+      namespace: xchemlab
diff --git a/charts/xchemlab/templates/init-script.yaml b/charts/xchemlab/templates/init-script.yaml
diff --git a/charts/xchemlab/templates/init-secret.yaml b/charts/xchemlab/templates/init-secret.yaml
@@ -0,0 +1,15 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: postgres-init-script
+  namespace: xchemlab
+spec:
+  encryptedData:
+    init.sql: AgBM7GbHesMBvR7yhaZAksO/GEDlA7C6KfaKsi3VFPNzbJSYY/2MMEw+BptGSeCMlxSl/CRWEHeeRQczFyhZt6ZgbLe8u4vSJRMHVVvNPCbHIb7EZYSM2FM+kv48p91GuThw7uRf4VspJqOsZUZ0J6PmxquG0A8FRaPKwvRU+UCE4Vc9Sb00ZAIhwMK9bC1O7i6zB7yR+SdRkD6KKIMUGC8HHu/k8WfFlPi1fOPbgKIyXr+t+WV77itESXFpz5zQc00iigs7hd3DVsoDQgQBnXCFpZfikrWT4vNecFf+wixKm8nLlz+tMEd4ZB6Kx+S0G20y6CLQYuWnsIPgGwO33h/s5HqbEaPB0/Jx8WO/UfQjIJ+qDTbFrdVLJjZCLjLevfLhvXf/p32p01TktROGBB33bsxOUPvuSWDQs7BE7vl2R0DhcPrXJbwfbeho8pSTAHSjmBh8R1qZG6H+CMuZFF7UmLZyRy4IbPParEcSKojMKTw4L7oRU77J6cAkLOVaWg4mz6yhXDLOod/DZwuf4VnEbhL5MMmjdIgrXWJ3SotsVc0Ax8lsRE9lEc2/3qq4biMg3suvKoaxOu9VjmKEzT6JnzZWkZASalWyQaDCu4Ee5pUMD0T5sFP5lxDHeXV7OFCRf0gc6beZZ5QlUpYqVe3GWkAkTrCs4ZepnZHwFZ1bMpGZ5Ngh18SRLzO8VT26gb51YL2hP6uSss/THf8Q6csVwpr2ovJuzRxPFvGezG3IYvF7LrvEKskwj8vTNzPqSP9ykK3v63NeyViL19ZKtCH0s2NRPRM5nVIejG0tgYbnCDe1gYQlpk7iqJyxCSVY69mv5btzUYv0qqHKQsJTwN5efL6gLr26lkXx2jQWkxuC7E0HgJSAsKjr6jQ3Oycb3VnVCejKNGss8wq10Ah6IZTVCXv+go/qnNYgopIIU9qWjJyGEGriF5qhMswxMfB759dYlvaj80u18vtgwb+G7ejbp7bG329Lu4XQzU/G9Heow+6+5wtUy9h5euqrOPR4gBhhN1iBf1PdNZX8IEey3NMxtV9VSqZ6AnJlTkcXzDzrowD8nVOSkuEdrZV1WKKDmi2K/7CprsidgwLL/0HM8fEDnEH6MgybpOZJ1kA1BQIl66e5EqEZL4NeDIMARw9ShoT1VtsRByWb6C/5EqvblkiAzA4Lqrtj2o7gBTaGu1+bJUNKRwVbqsNENyijxM/tdHGIYCZVq/qeVVp+8eS4ggaVCPp3W7y/BnwXifFceMHK1fDkp8h05RgkgdK2i3Ypgog41maXcsSDG8+44hWbkNtRIfYKJc1jVoae39nw1VI6PdHRnIwd1ZqSAf8/g2CdsshK+Tz+pnJZ6g/Okz0DoLQDpBGW/FipTZZn/XQjKbOL9NZsAvexSuh8NilYujKp4PDc1HqzpRouQQe75ZD1JikdE05p9J5QDKDhLdy1iXzAxqh1Qsj661tEAokIRD2QJN87sfZQbWEmSAyhN8mkryHl1kvYLssPTYxTOjonWKwqjO7/zcLLQLT7nxIZSmp4G7RKi/C+SCvVrUYJ970TJ55beZjcBjrg48LgX8S5E+9sdRkaefKQ7/CtGx1jmyp/Z/3YScGWLzejNZGTXlxk
+  template:
+    metadata:
+      creationTimestamp: null
+      name: postgres-init-script
+      namespace: xchemlab
+
diff --git a/charts/xchemlab/templates/pgpool-secret-sealed.yaml b/charts/xchemlab/templates/pgpool-secret-sealed.yaml
diff --git a/charts/xchemlab/templates/pgpool-secret.yaml b/charts/xchemlab/templates/pgpool-secret.yaml
@@ -0,0 +1,13 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: pgpool-passwords
+  namespace: xchemlab
+spec:
+  encryptedData:
+    admin-password: AgA+DTJgyISrh2I9MCWM8k6vR9aO61FIIxRWJ82OyNnA1yHdFgQcKsnSbEVJaYBPTerUyJUC7OuKiTs/IRlu6jAtJabiknoS0XVnTHp0RF42baMPBvR0d6pXBt+d9EFFv9vXKG5Ko6cd1fQkuI38i8qsrmBq0y8Z2vlvdq+hG9p/zFKLXON622NQWkLvc8d8y58nl+q1gOco/I+lP4E+2woHkhnsPHlh3+FhpaZXEaZRbSKkdB79rzeumlUrjwugWBxovz/8J4LjMtMv5Xt4LqNo2AAl1TRBxBG8RCaX59vRU4WFZf3gEsnCXBDWBwQTiIr/kt9L43hXqZK/FLUSPLcJruxrCdPRpe2dqvU1GfeDneg1aCgV6msc73K2zIOTVbACsb/glUwHRgr+C8c12oD1p/T+mL9E/dV37kRLHxOunmfcrsnpmWHtJB5y955HwBzw8MYiB7F7EFd78+8D7gQXvCdffRtELnhN9ynewCQd0P8DzK97JfJUIbB7+Wl6C8u9A1v0i6Tw7ofRNROuykVyNtK3jrGNeCxRH1cgowRVK6DlOBuZvEhAvE6/f5nLgF4FtLPYZkECqPMprpnSgLEj1ogNOq/+WpnXCfavX+tmrqBLmqtJfBVcl9LBjBgXiqsMXQ0zw2QSEzAaJHymc3Kur2BLnkHQ035UMrZ+CgExjFLSHqlo34VMQzytmuMy2dW0fFPSQMig1fduEJXJMzdcb+GTslJNjJM=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: pgpool-passwords
+      namespace: xchemlab
diff --git a/charts/xchemlab/templates/postgres-secret-sealed.yaml b/charts/xchemlab/templates/postgres-secret-sealed.yaml
diff --git a/charts/xchemlab/templates/postgres-secret.yaml b/charts/xchemlab/templates/postgres-secret.yaml
@@ -0,0 +1,14 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: postgres-passwords
+  namespace: xchemlab
+spec:
+  encryptedData:
+    password: AgBsk50Y8gy4qdfpauAD7opsqUSQnDnooUn7ADb/O7laUW3TVg1NSRNmmP2GUV462DGLAf3mg6wreTP+MatZKFvyfOo3Cn526BCdIBD98DikGKQMatzmQL6K7Ou5e7UnqVPM3nFAP5ggsb7+VKkQ/WoKr6hTnLRKQ+yreghhO51YGk9/VJF65SyVrJsdtXMWVcVasBsbOprfueBfgl1EEA5vNFw4EodSgjk6ulfEB1DEXgBtitYplKjW1D5IorC3+ZI3ig1U5LzLnCRfy0yF4C5zuuHl9wFqTibQW1AQMLHFSk0YMNEeIbmtzkSZA2EVc1pvAmBynZobOLC/FEYKO/6LJcI8wp6JevWr/JkWS1bWH4IXcWhO8T/ma+QsGdc7eXlAOdBdqTd+rsaxKaI6UTa0Vee+BCUzAzOetf1CYVtAnJWGArujhuzREOLAZ2nTJXZJUrp4AFnfBbykzqZ2G+5x5bT2xdgps3vEDAdVXz4IXnJ4l0fkCK6c3PMo4dUCegKTCmKN7fUDD8Qyn039T8nBd9Oee3zhxZE470plHLGV/wZq8uXSJ1FF8KOrOb4GeuWiFKvHlilLW3Vhda2CiqjtKIkoYj5ZW3oOiWnLe0HJwhLbmn8QC1I1+dy0+xeq+/V1RiEtZ9g9fcd5wf5UU7ZiCz87KqEA8NlXnJ0+s/6jUlJlRFydVlsOHrZ31Qgk91AVShVOpBxRKw14ffIN4YjYykBuNH1ZLJM=
+    repmgr-password: AgC7LcCkCtvVS8kRfJMQqMZz3UwWV9l+HEv5HaH5QOUSnuCQrKje0MNxAeNJxx7XYupfr8m/2dr1YUnXBPlV8Wc17I186P7jN9H/UF3O8kdqz64UnjqaB9y7CQ0Si1FrVZZfgxbE4spLOT04zk+EIYu/qiK615ythb7KXr41V1kDK4dAIyIuwCuZWzXaw1wL6N8DcnTfMKMa/wxNFIjx9SbrAJfD9kPzu5w9RKXJPsBKLjzDzNKgTDE0SC/rOYH/ncoKAtsIJxr80e7YS4boTfA03N73/GSB+8/74SEpVIm+1qghDm/9LSW53q1k11jCC9VZgvW9XJWxd6GHgkEMMqRNpQAspxCdZRAwFJ8KJl9QOxsN3p7n6K77V8Br9Y0OG46ewXmf9gaSf6eKqQkNJodR1hejXC2ys+3CGmpf/fwOiXmyH+4jMUQcCiuXyMt3/6gcH08MrLpIJDf75rxTQpuuhWvgnNPdfwEvcw6dKBmweQLiM5aybnFB1DdKkWHaDOJEn0iFhJttKHYRUNeLrdeW2ua4F48qnnf9tFAFafGU9tPsEZi2CJDIhnrB4dEz8e1OvZy9j5gTKWmeAbTZUWbtAOd7QuARxkdJl0bZCZQgF0gvEAoR0KTohzjImcgDQ0lDhjwJ2mo1Ic3oPJO2QwEi05QhZ2o8F5TU95VFknQiKzQuEusZo/a8WMhVMcisS8XiShNgQad13yUcLL64HYNuXEznl1qL7aE=
+  template:
+    metadata:
+      creationTimestamp: null
+      name: postgres-passwords
+      namespace: xchemlab
diff --git a/charts/xchemlab/values.yaml b/charts/xchemlab/values.yaml
@@ -22,44 +22,44 @@ chimp-chomp:
 compound-library:
   enabled: true
   database:
-    host: postgres://postgresql-ha-pgpool
-    user: postgres
+    host: postgres://postgresql-ha-pgpool.xchemlab.svc.cluster.local
+    user: xchemlab
     password:
-      secretName: postgres-passwords
-      secretKey: password
+      secretName: application-passwords
+      secretKey: passwords
   opa:
     url: http://{{ .Release.Name }}-opa-kube-mgmt:8181
 
 compound-soaking:
   enabled: true
   database:
-    host: postgres://postgresql-ha-pgpool
-    user: postgres
+    host: postgres://postgresql-ha-pgpool.xchemlab.svc.cluster.local
+    user: xchemlab
     password:
-      secretName: postgres-passwords
-      secretKey: password
+      secretName: application-passwords
+      secretKey: passwords
   opa:
     url: http://{{ .Release.Name }}-opa-kube-mgmt:8181
 
 crystal-library:
   enabled: true
   database:
-    host: postgres://postgresql-ha-pgpool
-    user: postgres
+    host: postgres://postgresql-ha-pgpool.xchemlab.svc.cluster.local
+    user: xchemlab
     password:
-      secretName: postgres-passwords
-      secretKey: password
+      secretName: application-passwords
+      secretKey: passwords
   opa:
     url: http://{{ .Release.Name }}-opa-kube-mgmt:8181
 
 pin-packing:
   enabled: true
   database:
-    host: postgres://postgresql-ha-pgpool
-    user: postgres
+    host: postgres://postgresql-ha-pgpool.xchemlab.svc.cluster.local
+    user: xchemlab
     password:
-      secretName: postgres-passwords
-      secretKey: password
+      secretName: application-passwords
+      secretKey: passwords
   opa:
     url: http://{{ .Release.Name }}-opa-kube-mgmt:8181
 
@@ -77,11 +77,11 @@ targeting:
       secretName: targeting-s3-secret
       secretKey: secret-access-key
   database:
-    host: postgres://postgresql-ha-pgpool
-    user: postgres
+    host: postgres://postgresql-ha-pgpool.xchemlab.svc.cluster.local
+    user: xchemlab
     password:
-      secretName: postgres-passwords
-      secretKey: password
+      secretName: application-passwords
+      secretKey: passwords
   opa:
     url: http://{{ .Release.Name }}-opa-kube-mgmt:8181
 
@@ -167,7 +167,7 @@ postgresql-ha:
       limits:
         cpu: 2
         memory: 2Gi
-    initdbScripts: init-script
+    initdbScriptsSecret: postgres-init-script
 
   pgpool:
     existingSecret: pgpool-passwords