From f42dc09f09b773e3272ea87328295197ab626383 Mon Sep 17 00:00:00 2001
From: friedrich goerz <friedrich.goerz@netgo.de>
Date: Thu, 9 Mar 2023 11:31:04 +0100
Subject: [PATCH] DEV-927: fixing problems

---
 roles/kubernetes/argocd/defaults/main.yml | 12 ++++++++----
 roles/kubernetes/argocd/tasks/main.yml    |  2 +-
 stage-prodwork01-netgo-hcloud.yml         |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/roles/kubernetes/argocd/defaults/main.yml b/roles/kubernetes/argocd/defaults/main.yml
index 4385167..a82ecc9 100644
--- a/roles/kubernetes/argocd/defaults/main.yml
+++ b/roles/kubernetes/argocd/defaults/main.yml
@@ -30,10 +30,12 @@ argo_realm_users: [
 ]
 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
 k8s_argocd_helm__release_values:
   controller:
-    logLevel: warn
+    logLevel: info
     logFormat: json
     metrics:
       enabled: true
@@ -53,7 +55,7 @@ k8s_argocd_helm__release_values:
       - secrets
       verbs:
       - get
-    logLevel: warn
+    logLevel: info
     logFormat: json
     metrics:
       enabled: true
@@ -69,6 +71,8 @@ k8s_argocd_helm__release_values:
         value: "300s"
       - name: XDG_CONFIG_HOME
         value: /.config
+      - name: HELM_CONFIG_HOME
+        value: /.config
       - name: GNUPGHOME
         value: /home/argocd/.gnupg
       - name: HELM_PLUGINS
@@ -168,7 +172,7 @@ k8s_argocd_helm__release_values:
           - mountPath: /custom-tools
             name: custom-tools-helm
       - 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"]
         env:
           - name: GNUPGHOME
@@ -179,7 +183,7 @@ k8s_argocd_helm__release_values:
           - mountPath: /gnupg-home
             name: gnupg-home
   server:
-    logLevel: warn
+    logLevel: info
     logFormat: json
     config:
       oidc.config: |
diff --git a/roles/kubernetes/argocd/tasks/main.yml b/roles/kubernetes/argocd/tasks/main.yml
index cd2d044..74ab357 100644
--- a/roles/kubernetes/argocd/tasks/main.yml
+++ b/roles/kubernetes/argocd/tasks/main.yml
@@ -270,7 +270,7 @@
     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') }}"
     release_namespace: "{{ k8s_argocd_helm__release_namespace }}"
-    chart_version: 5.6.0
+    chart_version: "{{ k8s_argocd_helm__chart_version }}"
     create_namespace: yes
     release_values: "{{ combined_helm__release_values }}"
   when:
diff --git a/stage-prodwork01-netgo-hcloud.yml b/stage-prodwork01-netgo-hcloud.yml
index 095ccbe..1788d7e 100644
--- a/stage-prodwork01-netgo-hcloud.yml
+++ b/stage-prodwork01-netgo-hcloud.yml
@@ -12,6 +12,7 @@
 plugin: netgo-hcloud
 
 stage: "prodwork01"
+stage_kube: "{{ stage }}"
 label_selector: "stage=prodwork01" # jinja isn't available here
 
 api_token: !vault |