Merge pull request #554 from slok/slok/fenix

Update deployment manifests Git-sync from v3 to v4

Author: slok

CHANGELOG.md

@@ -11,10 +11,12 @@
 - Update to Go 1.24.
 - Update to Kubernetes v1.32.
 - Update all other dependencies to latest versions.
+- Migrate deployment manifests `git-sync` to v4.
 
 ### Fixes
 
 - Allow spec files with CRLF.
+- Helm chart tolerations
 
 ## [v0.11.0] - 2022-10-22
 

deploy/kubernetes/helm/sloth/Chart.yaml

@@ -4,4 +4,4 @@ description: Base chart for Sloth.
 type: application
 home: https://github.com/slok/sloth
 kubeVersion: ">= 1.19.0-0"
-version: 0.7.1
+version: 0.8.0

deploy/kubernetes/helm/sloth/templates/deployment.yaml

@@ -95,13 +95,13 @@ spec:
           image: {{ .Values.commonPlugins.image.repository }}:{{ .Values.commonPlugins.image.tag }}
           args:
             - --repo={{.Values.commonPlugins.gitRepo.url}}
-            - --branch={{.Values.commonPlugins.gitRepo.branch}}
-            - --wait=30
+            - --ref={{.Values.commonPlugins.gitRepo.branch}}
+            - --period=30s
             - --webhook-url=http://localhost:8082/-/reload
           volumeMounts:
             - name: sloth-common-sli-plugins
               # Default path for git-sync.
-              mountPath: /tmp/git
+              mountPath: /git
           {{- with .Values.securityContext.container }}
           securityContext:
             {{- toYaml . | nindent 12 }}

deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml

@@ -68,16 +68,16 @@ spec:
               cpu: 5m
               memory: 75Mi
         - name: git-sync-plugins
-          image: k8s.gcr.io/git-sync/git-sync:v3.6.1
+          image: registry.k8s.io/git-sync/git-sync:v4.4.0
           args:
             - --repo=https://github.com/slok/sloth-test-common-sli-plugins
-            - --branch=main
-            - --wait=30
+            - --ref=main
+            - --period=30s
             - --webhook-url=http://localhost:8082/-/reload
           volumeMounts:
             - name: sloth-common-sli-plugins
               # Default path for git-sync.
-              mountPath: /tmp/git
+              mountPath: /git
           securityContext:
             allowPrivilegeEscalation: false
           resources:

deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml

@@ -52,16 +52,16 @@ spec:
               cpu: 5m
               memory: 75Mi
         - name: git-sync-plugins
-          image: k8s.gcr.io/git-sync/git-sync:v3.6.1
+          image: registry.k8s.io/git-sync/git-sync:v4.4.0
           args:
             - --repo=https://github.com/slok/sloth-common-sli-plugins
-            - --branch=main
-            - --wait=30
+            - --ref=main
+            - --period=30s
             - --webhook-url=http://localhost:8082/-/reload
           volumeMounts:
             - name: sloth-common-sli-plugins
               # Default path for git-sync.
-              mountPath: /tmp/git
+              mountPath: /git
           resources:
             limits:
               cpu: 50m

deploy/kubernetes/helm/sloth/values.yaml

@@ -33,8 +33,8 @@ sloth:
 commonPlugins:
   enabled: true
   image:
-    repository: k8s.gcr.io/git-sync/git-sync
-    tag: v3.6.1
+    repository: registry.k8s.io/git-sync/git-sync
+    tag: v4.4.0
   gitRepo:
     url: https://github.com/slok/sloth-common-sli-plugins
     branch: main

deploy/kubernetes/raw/sloth-with-common-plugins.yaml

@@ -6,7 +6,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -18,7 +18,7 @@ kind: ClusterRole
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -38,7 +38,7 @@ kind: ClusterRoleBinding
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -59,7 +59,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -74,7 +74,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: sloth-0.7.0
+        helm.sh/chart: sloth-0.8.0
         app.kubernetes.io/managed-by: Helm
         app: sloth
         app.kubernetes.io/name: sloth
@@ -105,16 +105,16 @@ spec:
               cpu: 5m
               memory: 75Mi
         - name: git-sync-plugins
-          image: k8s.gcr.io/git-sync/git-sync:v3.6.1
+          image: registry.k8s.io/git-sync/git-sync:v4.4.0
           args:
             - --repo=https://github.com/slok/sloth-common-sli-plugins
-            - --branch=main
-            - --wait=30
+            - --ref=main
+            - --period=30s
             - --webhook-url=http://localhost:8082/-/reload
           volumeMounts:
             - name: sloth-common-sli-plugins
               # Default path for git-sync.
-              mountPath: /tmp/git
+              mountPath: /git
           resources:
             limits:
               cpu: 50m
@@ -133,7 +133,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth

deploy/kubernetes/raw/sloth.yaml

@@ -6,7 +6,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -18,7 +18,7 @@ kind: ClusterRole
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -38,7 +38,7 @@ kind: ClusterRoleBinding
 metadata:
   name: sloth
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -59,7 +59,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth
@@ -74,7 +74,7 @@ spec:
   template:
     metadata:
       labels:
-        helm.sh/chart: sloth-0.7.0
+        helm.sh/chart: sloth-0.8.0
         app.kubernetes.io/managed-by: Helm
         app: sloth
         app.kubernetes.io/name: sloth
@@ -108,7 +108,7 @@ metadata:
   name: sloth
   namespace: monitoring
   labels:
-    helm.sh/chart: sloth-0.7.0
+    helm.sh/chart: sloth-0.8.0
     app.kubernetes.io/managed-by: Helm
     app: sloth
     app.kubernetes.io/name: sloth