Merge branch 'master' into support-flux-managed-clusters

Signed-off-by: QuentinBisson <[email protected]>

.github/workflows/zz_generated.check_values_schema.yaml

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 name: 'Values and schema'
 on:

.github/workflows/zz_generated.create_release.yaml

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 name: Create Release
 on:
@@ -15,7 +15,7 @@ on:
 jobs:
   debug_info:
     name: Debug info
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Print github context JSON
         run: |
@@ -24,7 +24,7 @@ jobs:
           EOF
   gather_facts:
     name: Gather facts
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       project_go_path: ${{ steps.get_project_go_path.outputs.path }}
       ref_version: ${{ steps.ref_version.outputs.refversion }}
@@ -84,7 +84,7 @@ jobs:
           echo "refversion=${refversion}" >> $GITHUB_OUTPUT
   update_project_go:
     name: Update project.go
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ needs.gather_facts.outputs.version != '' && needs.gather_facts.outputs.project_go_path != '' && needs.gather_facts.outputs.ref_version != 'true' }}
     needs:
       - gather_facts
@@ -146,7 +146,7 @@ jobs:
           hub pull-request -f  -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }}
   create_release:
     name: Create release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - gather_facts
     if: ${{ needs.gather_facts.outputs.version }}
@@ -194,7 +194,7 @@ jobs:
 
   create-release-branch:
     name: Create release branch
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - gather_facts
     if: ${{ needs.gather_facts.outputs.version }}

.github/workflows/zz_generated.create_release_pr.yaml

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 name: Create Release PR
 on:
@@ -30,7 +30,7 @@ on:
 jobs:
   debug_info:
     name: Debug info
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Print github context JSON
         run: |
@@ -39,7 +39,7 @@ jobs:
           EOF
   gather_facts:
     name: Gather facts
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       repo_name: ${{ steps.gather_facts.outputs.repo_name }}
       branch: ${{ steps.gather_facts.outputs.branch }}
@@ -136,7 +136,7 @@ jobs:
           fi
   create_release_pr:
     name: Create release PR
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - gather_facts
     if: ${{ needs.gather_facts.outputs.skip != 'true' }}

.github/workflows/zz_generated.gitleaks.yaml

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 name: gitleaks
 

Makefile

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 
 include Makefile.*.mk

Makefile.gen.app.mk

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 
 ##@ App

Makefile.gen.go.mk

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 
 APPLICATION    := $(shell go list -m | cut -d '/' -f 3)

Makefile.gen.k8sapi.mk

@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.6.0
+#    devctl@6.9.0
 #
 
 # Directories.

files/templates/scrapeconfigs/_tlsconfig.yaml

@@ -1,19 +1,19 @@
 [[- define "_tlsconfig" -]]
 [[- if ne .ClusterType "management_cluster" -]]
-[[- if eq .AuthenticationType "token" -]]
-bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token
-[[- end ]]
-tls_config:
-  ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca
-[[- if eq .AuthenticationType "certificates" ]]
-  cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt
-  key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key
-[[- end ]]
-  insecure_skip_verify: false
-[[- else -]]
-bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-tls_config:
-  ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-  insecure_skip_verify: true
+  [[- if eq .AuthenticationType "token" ]]
+  bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token
+  [[- end ]]
+  tls_config:
+    ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca
+    [[- if eq .AuthenticationType "certificates" ]]
+    cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt
+    key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key
+    [[- end ]]
+    insecure_skip_verify: false
+[[- else ]]
+  bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+  tls_config:
+    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    insecure_skip_verify: true
 [[- end -]]
 [[- end -]]

files/templates/scrapeconfigs/_tlsconfig_skip.yaml

@@ -1,19 +1,19 @@
 [[- define "_tlsconfig_skip" -]]
 [[- if ne .ClusterType "management_cluster" -]]
-[[- if eq .AuthenticationType "token" -]]
-bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token
-[[- end ]]
-tls_config:
-  ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca
-[[- if eq .AuthenticationType "certificates" ]]
-  cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt
-  key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key
-[[- end ]]
-  insecure_skip_verify: true
-[[- else -]]
-bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-tls_config:
-  ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-  insecure_skip_verify: true
+  [[- if eq .AuthenticationType "token" ]]
+  bearer_token_file: /etc/prometheus/secrets/[[ .SecretName ]]/token
+  [[- end ]]
+  tls_config:
+    ca_file: /etc/prometheus/secrets/[[ .SecretName ]]/ca
+    [[- if eq .AuthenticationType "certificates" ]]
+    cert_file: /etc/prometheus/secrets/[[ .SecretName ]]/crt
+    key_file: /etc/prometheus/secrets/[[ .SecretName ]]/key
+    [[- end ]]
+    insecure_skip_verify: true
+[[- else ]]
+  bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+  tls_config:
+    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    insecure_skip_verify: true
 [[- end -]]
 [[- end -]]