DEV-927: fixing problems

qa
friedrich goerz 3 years ago
parent fc20866399
commit f42dc09f09

@ -30,10 +30,12 @@ argo_realm_users: [
] ]
argocd_server_admin_password: "{{ argocd_server_admin_password_vault | default( lookup('community.general.random_string', length=20) ) }}" argocd_server_admin_password: "{{ argocd_server_admin_password_vault | default( lookup('community.general.random_string', length=20) ) }}"
k8s_argocd_helm__chart_version: 5.19.0
# https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd # https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
k8s_argocd_helm__release_values: k8s_argocd_helm__release_values:
controller: controller:
logLevel: warn logLevel: info
logFormat: json logFormat: json
metrics: metrics:
enabled: true enabled: true
@ -53,7 +55,7 @@ k8s_argocd_helm__release_values:
- secrets - secrets
verbs: verbs:
- get - get
logLevel: warn logLevel: info
logFormat: json logFormat: json
metrics: metrics:
enabled: true enabled: true
@ -69,6 +71,8 @@ k8s_argocd_helm__release_values:
value: "300s" value: "300s"
- name: XDG_CONFIG_HOME - name: XDG_CONFIG_HOME
value: /.config value: /.config
- name: HELM_CONFIG_HOME
value: /.config
- name: GNUPGHOME - name: GNUPGHOME
value: /home/argocd/.gnupg value: /home/argocd/.gnupg
- name: HELM_PLUGINS - name: HELM_PLUGINS
@ -168,7 +172,7 @@ k8s_argocd_helm__release_values:
- mountPath: /custom-tools - mountPath: /custom-tools
name: custom-tools-helm name: custom-tools-helm
- name: 3-import-gpg-key - name: 3-import-gpg-key
image: argoproj/argocd:v2.2.5 image: argoproj/argocd:v2.5.7
command: ["gpg", "--import","/sops-gpg/gpg_key_smardigo_automation__private"] command: ["gpg", "--import","/sops-gpg/gpg_key_smardigo_automation__private"]
env: env:
- name: GNUPGHOME - name: GNUPGHOME
@ -179,7 +183,7 @@ k8s_argocd_helm__release_values:
- mountPath: /gnupg-home - mountPath: /gnupg-home
name: gnupg-home name: gnupg-home
server: server:
logLevel: warn logLevel: info
logFormat: json logFormat: json
config: config:
oidc.config: | oidc.config: |

@ -270,7 +270,7 @@
chart_ref: "{{ k8s_argocd_helm__chart_ref | default('argo-cd') }}" chart_ref: "{{ k8s_argocd_helm__chart_ref | default('argo-cd') }}"
chart_repo_url: "{{ k8s_argocd_helm__chart_repo_url | default('https://argoproj.github.io/argo-helm') }}" chart_repo_url: "{{ k8s_argocd_helm__chart_repo_url | default('https://argoproj.github.io/argo-helm') }}"
release_namespace: "{{ k8s_argocd_helm__release_namespace }}" release_namespace: "{{ k8s_argocd_helm__release_namespace }}"
chart_version: 5.6.0 chart_version: "{{ k8s_argocd_helm__chart_version }}"
create_namespace: yes create_namespace: yes
release_values: "{{ combined_helm__release_values }}" release_values: "{{ combined_helm__release_values }}"
when: when:

@ -12,6 +12,7 @@
plugin: netgo-hcloud plugin: netgo-hcloud
stage: "prodwork01" stage: "prodwork01"
stage_kube: "{{ stage }}"
label_selector: "stage=prodwork01" # jinja isn't available here label_selector: "stage=prodwork01" # jinja isn't available here
api_token: !vault | api_token: !vault |

Loading…
Cancel
Save