From 398f52772876bf85023d2a7cdd9bc2abc439af15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Thu, 10 Jul 2025 16:32:44 +0000 Subject: [PATCH 1/5] ci: plume --- values/plume/values/values-staging.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values/plume/values/values-staging.yaml b/values/plume/values/values-staging.yaml index 173d2e23..08fa5520 100644 --- a/values/plume/values/values-staging.yaml +++ b/values/plume/values/values-staging.yaml @@ -1,6 +1,6 @@ replicaCount: 1 image: - tag: 0cb7f469-debug + tag: 662e6b05-debug podAnnotations: dapr.io/enabled: "true" dapr.io/app-id: "staging-plume" From 2d3966260d55dc80fac77b8be52108494f611e31 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 10 Jul 2025 16:37:40 +0000 Subject: [PATCH 2/5] ci: plume --- charts/plume/Chart.yaml | 4 ++-- charts/plume/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/plume/Chart.yaml b/charts/plume/Chart.yaml index bf082802..c6faad83 100644 --- a/charts/plume/Chart.yaml +++ b/charts/plume/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: v1.4.17 +version: v1.4.18 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v1.4.17 +appVersion: v1.4.18 diff --git a/charts/plume/values.yaml b/charts/plume/values.yaml index d68ff48e..eb663fdd 100644 --- a/charts/plume/values.yaml +++ b/charts/plume/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: registry.gitlab.com/oceanbox/plume/plume - tag: v1.4.17 + tag: v1.4.18 pullPolicy: IfNotPresent init: enabled: false From d93032c4fe3fccf0b65d304080f7fcaf71455dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Fri, 11 Jul 2025 08:47:30 +0200 Subject: [PATCH 3/5] fix: Switch trustAnchorPEM --- values/linkerd/env.yaml.gotmpl | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/values/linkerd/env.yaml.gotmpl b/values/linkerd/env.yaml.gotmpl index e1b95e18..7eb2fc23 100644 --- a/values/linkerd/env.yaml.gotmpl +++ b/values/linkerd/env.yaml.gotmpl @@ -2,17 +2,16 @@ linkerd: enabled: true autosync: true trustAnchorPEM: | - -----BEGIN CERTIFICATE----- - MIIBtDCCAVqgAwIBAgIQRlhbOLj9zw+QTGHqbOBaozAKBggqhkjOPQQDAjAlMSMw - IQYDVQQDExpyb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0yMTA0MDkxNDAy - NTFaFw0zMTA0MDcxNDAyNTFaMCUxIzAhBgNVBAMTGnJvb3QubGlua2VyZC5jbHVz - dGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEljOLtSPSi6XIEdFP - VCGa4BKoQ0X5dBSZvHRLt/IzHRzAbIVIjgjvyRQc7EQlRKvZ8P9um/WG1ypyyA2l - C9MWz6NsMGowDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYD - VR0OBBYEFHz4UuVKCNX8/hsZCcdTlmWnSCGXMCUGA1UdEQQeMByCGnJvb3QubGlu - a2VyZC5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIGAiz3yNhboVdze1 - sNFcFL2GF5WwW9z53u03UkPkiuBTAiEA4ZHWZJVGV5VAQArL5v32HeH/IjC1ssGl - 7Y8D0rQqkis= + -----BEGIN CERTIFICATE----- + MIIBjjCCATSgAwIBAgIRAM6yOCJ3CrItI6bkXf+oSDUwCgYIKoZIzj0EAwIwJTEj + MCEGA1UEAxMacm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjUwNzExMDYz + ODI2WhcNMzAwNzEwMDYzODI2WjAlMSMwIQYDVQQDExpyb290LmxpbmtlcmQuY2x1 + c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ6UxAv/KZyWdEHS + TkNqZ/z71Fb/qVfa7SgAeuA6iUeN9GugWsVzvwePIyVBrCAhcCrHNNZgM0B6xtFK + gck/RGyjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0G + A1UdDgQWBBRFGEyjBfb9u3S1kQ+qbCBW1y5c/TAKBggqhkjOPQQDAgNIADBFAiBe + 6NOflMzmIB6/0z4WeH++IA0KSUA89e3Tf1lpQ0aLSwIhAP5dCk+NKN/92hC0IJpj + bDdhV2Vikg98TwFjq41d2fPb -----END CERTIFICATE----- webhookPEM: | -----BEGIN CERTIFICATE----- From 2ba0d9cf5b3ea6550785f780b05cd7d1df978f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Fri, 11 Jul 2025 08:48:56 +0200 Subject: [PATCH 4/5] fix: Crt formatting --- values/linkerd/env.yaml.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values/linkerd/env.yaml.gotmpl b/values/linkerd/env.yaml.gotmpl index 7eb2fc23..ee5c2c99 100644 --- a/values/linkerd/env.yaml.gotmpl +++ b/values/linkerd/env.yaml.gotmpl @@ -2,7 +2,7 @@ linkerd: enabled: true autosync: true trustAnchorPEM: | - -----BEGIN CERTIFICATE----- + -----BEGIN CERTIFICATE----- MIIBjjCCATSgAwIBAgIRAM6yOCJ3CrItI6bkXf+oSDUwCgYIKoZIzj0EAwIwJTEj MCEGA1UEAxMacm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjUwNzExMDYz ODI2WhcNMzAwNzEwMDYzODI2WjAlMSMwIQYDVQQDExpyb290LmxpbmtlcmQuY2x1 From ba5491a5b9b7e7022e72d08e0e605bb92fc2cfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20J=C3=B6rg?= Date: Fri, 11 Jul 2025 09:13:57 +0200 Subject: [PATCH 5/5] fix: Bump linkerd to latest stable --- helmfile.d/linkerd.yaml.gotmpl | 2 +- shell.nix | 6 +++++- values/linkerd/env.yaml.gotmpl | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/helmfile.d/linkerd.yaml.gotmpl b/helmfile.d/linkerd.yaml.gotmpl index b400d853..d2fe276c 100644 --- a/helmfile.d/linkerd.yaml.gotmpl +++ b/helmfile.d/linkerd.yaml.gotmpl @@ -15,7 +15,7 @@ releases: - name: linkerd namespace: linkerd chart: linkerd/linkerd-control-plane - version: 1.9.3 + version: 1.16.10 condition: linkerd.enabled values: - ../values/linkerd/values/linkerd.yaml.gotmpl diff --git a/shell.nix b/shell.nix index 434826f5..f064878d 100644 --- a/shell.nix +++ b/shell.nix @@ -36,8 +36,12 @@ pkgs.mkShellNoCC { kubectl-neat kubelogin kubelogin-oidc + + # linkerd + step-cli + linkerd ]; - ARGOCD_ENV_CLUSTER_NAME = "oceanbox"; + ARGOCD_ENV_CLUSTER_NAME = "ekman"; HELM_GIT_ACCESS_TOKEN = "glpat-xxx"; } diff --git a/values/linkerd/env.yaml.gotmpl b/values/linkerd/env.yaml.gotmpl index ee5c2c99..a4ee959c 100644 --- a/values/linkerd/env.yaml.gotmpl +++ b/values/linkerd/env.yaml.gotmpl @@ -28,7 +28,7 @@ linkerd: identityIssuerPEM: "" secretScheme: kubernetes.io/tls crds: - version: 1.4.0 + version: 1.8.0 multicluster: version: 30.2.0 enabled: false