Merge branch 'main' of gitlab.com:oceanbox/manifests

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

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

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

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";
 }

values/linkerd/env.yaml.gotmpl

@@ -3,16 +3,15 @@ linkerd:
   autosync: true
   trustAnchorPEM: |
     -----BEGIN CERTIFICATE-----
-    MIIBtDCCAVqgAwIBAgIQRlhbOLj9zw+QTGHqbOBaozAKBggqhkjOPQQDAjAlMSMw
+    MIIBjjCCATSgAwIBAgIRAM6yOCJ3CrItI6bkXf+oSDUwCgYIKoZIzj0EAwIwJTEj
-    IQYDVQQDExpyb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0yMTA0MDkxNDAy
+    MCEGA1UEAxMacm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjUwNzExMDYz
-    NTFaFw0zMTA0MDcxNDAyNTFaMCUxIzAhBgNVBAMTGnJvb3QubGlua2VyZC5jbHVz
+    ODI2WhcNMzAwNzEwMDYzODI2WjAlMSMwIQYDVQQDExpyb290LmxpbmtlcmQuY2x1
-    dGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEljOLtSPSi6XIEdFP
+    c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ6UxAv/KZyWdEHS
-    VCGa4BKoQ0X5dBSZvHRLt/IzHRzAbIVIjgjvyRQc7EQlRKvZ8P9um/WG1ypyyA2l
+    TkNqZ/z71Fb/qVfa7SgAeuA6iUeN9GugWsVzvwePIyVBrCAhcCrHNNZgM0B6xtFK
-    C9MWz6NsMGowDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYD
+    gck/RGyjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0G
-    VR0OBBYEFHz4UuVKCNX8/hsZCcdTlmWnSCGXMCUGA1UdEQQeMByCGnJvb3QubGlu
+    A1UdDgQWBBRFGEyjBfb9u3S1kQ+qbCBW1y5c/TAKBggqhkjOPQQDAgNIADBFAiBe
-    a2VyZC5jbHVzdGVyLmxvY2FsMAoGCCqGSM49BAMCA0gAMEUCIGAiz3yNhboVdze1
+    6NOflMzmIB6/0z4WeH++IA0KSUA89e3Tf1lpQ0aLSwIhAP5dCk+NKN/92hC0IJpj
-    sNFcFL2GF5WwW9z53u03UkPkiuBTAiEA4ZHWZJVGV5VAQArL5v32HeH/IjC1ssGl
+    bDdhV2Vikg98TwFjq41d2fPb
-    7Y8D0rQqkis=
     -----END CERTIFICATE-----
   webhookPEM: |
     -----BEGIN CERTIFICATE-----
@@ -29,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

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"