diff --git a/Chart.yaml b/Chart.yaml index a90958a..9569264 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -25,5 +25,5 @@ appVersion: "0.1.1" dependencies: - name: bootstrap - version: 0.1.25 + version: 0.1.26 repository: oci://prodnso-harbor-01.smardigo.digital/infrastructure diff --git a/secrets.yaml b/secrets.yaml index 8efafcb..63baf7c 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -11,14 +11,17 @@ alertmanager_htpasswd_auth_string: ENC[AES256_GCM,data:f0RAfj+h46ieMG16f/10RppLK mobene_harbor_helm_user: ENC[AES256_GCM,data:JfDoHcJ4zjK86V5HRg==,iv:yuLcBiSe6L8Qc83l6I7oH5zKetiWJhXG619uaQahj7U=,tag:k3Dj/kSsYwUgwD6Yp8RDJg==,type:str] mobene_harbor_helm_password: ENC[AES256_GCM,data:ADxdWzMvAxQR/JSRTWSmdB1EPCysk84MIQCbQuikxlRvHpjDE5oH3w==,iv:KmmUqNwF1eBkxReqsFy3PzG9BkhK1qP7GcTG6tS6c28=,tag:kqgGJATVB8oa7K1dX4TY0A==,type:str] postgres_keycloak_password: ENC[AES256_GCM,data:LJU1B4aN6y0MnS+17OmGZDK6T5w=,iv:VnJlw/7UaasfaOT6IWV2PK4s38qTLqDyKD3W4qHNfv0=,tag:ibIh5KJTmqkWKh/AQ/8bBQ==,type:str] +oidc: + username: ENC[AES256_GCM,data:ImJkOwuPJ3oxjE7iKhg=,iv:nHC+uvx/WhUleiq5z4X7rE+ePEP4ClMwmlp2b3U0no0=,tag:2ZhMiIeJKoCTGCLwc4610Q==,type:str] + password: ENC[AES256_GCM,data:T45lrs+ad0M5aL99sGbkZNgnNsbXAptkUZIpnnsaN6I=,iv:TAF6+gJLIpzdzVGQdsU85CHBY5CKdZv1+3+2uY8evyg=,tag:9+P416svfHp95uvClyfRnQ==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-11-29T13:37:25Z" - mac: ENC[AES256_GCM,data:YOZ++c0qm6+coLIqVQ7oHYTwzHao96NwMnzQ53j/UfepeG2ei+nzg1AUOIp3a5UlQ7Ms0DlUxX04NonxmYbzDLQraW+95eOJxFUUK8EHia2kRlEoIbSg+rC0Clp+hN2dmyeKHCDyYbCt/87tVGN6clhTC+Ws/Ayq5btCz0bhVG8=,iv:3c2T5MLHVs9STHjk8MJjG1vXPp6xgTMLP1deR4iVSXs=,tag:S7VVLkYjX1dL0g79Lj8eAw==,type:str] + lastmodified: "2022-12-13T08:27:13Z" + mac: ENC[AES256_GCM,data:pjiVcLtPfInvlYpEuSw4WJKwCKsGbQQzFhznLnD7rPkwpi+2V/DlnLMpVwvCSgRl545BMhMpK+0MHZY3UiFWZ5XItrXxL54xdFCPNagzgenpGcBBUF/M0SQJOfxpez207HnZMg5sAhCa0kNfJHyIkAA82AZ3Wv78NYvUcmyI/9A=,iv:7nm9BU07H+nW3r2UWkT81SZ3grm9EDR8soKqUcQ48G4=,tag:OmsrpZ4cP+9Yr5z/+PQIMg==,type:str] pgp: - created_at: "2022-11-29T13:37:24Z" enc: | diff --git a/templates/secret_iam_keycloakcreds.yaml b/templates/secret_iam_keycloakcreds.yaml new file mode 100644 index 0000000..fae7643 --- /dev/null +++ b/templates/secret_iam_keycloakcreds.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +stringData: + username: {{ .Values.oidc.iam_keycloak_username}} + password: {{ .Values.oidc.iam_keycloak_password }} +kind: Secret +metadata: + name: iam_keycloak_creds + namespace: {{ .Values.bootstrap.oidc.namespace }} +type: Opaque diff --git a/templates/secret_postgres_keycloak.yaml b/templates/secret_postgres_keycloak.yaml index d959cd5..0078b06 100644 --- a/templates/secret_postgres_keycloak.yaml +++ b/templates/secret_postgres_keycloak.yaml @@ -9,5 +9,5 @@ metadata: cluster-name: postgres-keycloak-cluster team: postgres name: keycloakadmin.postgres-keycloak-cluster.credentials.postgresql.acid.zalan.do - namespace: {{ .Values.bootstrap.keycloak_namespace }} -type: Opaque \ No newline at end of file + namespace: {{ .Values.bootstrap.oidc_namespace }} +type: Opaque diff --git a/values.yaml b/values.yaml index 9d1954b..763356a 100644 --- a/values.yaml +++ b/values.yaml @@ -41,7 +41,12 @@ bootstrap: teams_webhook: https://netgo.webhook.office.com/webhookb2/783c0128-5ab8-45a5-a81f-f9f78a98c342@a80318cd-cd6f-4d2e-83bb-ce3d4140f8b7/IncomingWebhook/d66e86e336004dfd980f208274141ee3/521ac200-eb68-43b8-ae5b-a4f210b0f983 alertmanager_config_secret_name: myalertmanager - keycloak_namespace: mobene-keycloak + oidc: + namespace: mobene-keycloak + iam: + secret_name_keycloak_creds: iam_keycloak_creds + envvars: + iam_keycloak_auth_server_url: "https://prodwork01-keycloak-01-keycloak.smardigo.digital/auth/" prometheus_config_blackbox_targets: - https://www.google.com