Merge pull request #1569 from FabianKramm/main

refactor: add startup probes
loft-sh · Feb 28, 2024 · de69d08 · de69d08
2 parents 306de8b + da639a2
commit de69d08
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 6 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Setup Just
         uses: extractions/setup-just@v1
       - name: Setup Syft
@@ -73,7 +73,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: false
       - name: Setup Just
         uses: extractions/setup-just@v1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           cache: false
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Setup Just
         uses: extractions/setup-just@v1
       - name: Setup Cosgin

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go 1.21
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: false
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.5 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /vcluster-dev
 ARG TARGETOS

diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /vcluster-dev
 ARG TARGETOS

diff --git a/charts/eks/templates/syncer.yaml b/charts/eks/templates/syncer.yaml
@@ -305,6 +305,13 @@ spec:
         {{- end }}
         {{- if .Values.syncer.readinessProbe }}
         {{- if .Values.syncer.readinessProbe.enabled }}
+        startupProbe:
+          httpGet:
+            path: /readyz
+            port: 8443
+            scheme: HTTPS
+          failureThreshold: 300
+          periodSeconds: 6
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/k0s/templates/syncer.yaml b/charts/k0s/templates/syncer.yaml
@@ -249,6 +249,13 @@ spec:
         {{- end }}
         {{- if .Values.syncer.readinessProbe }}
         {{- if .Values.syncer.readinessProbe.enabled }}
+        startupProbe:
+          httpGet:
+            path: /readyz
+            port: 8443
+            scheme: HTTPS
+          failureThreshold: 300
+          periodSeconds: 6
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/k3s/templates/syncer.yaml b/charts/k3s/templates/syncer.yaml
@@ -296,6 +296,13 @@ spec:
         {{- end }}
         {{- if .Values.syncer.readinessProbe }}
         {{- if .Values.syncer.readinessProbe.enabled }}
+        startupProbe:
+          httpGet:
+            path: /readyz
+            port: 8443
+            scheme: HTTPS
+          failureThreshold: 300
+          periodSeconds: 6
         readinessProbe:
           httpGet:
             path: /readyz

diff --git a/charts/k8s/templates/syncer.yaml b/charts/k8s/templates/syncer.yaml
@@ -324,6 +324,13 @@ spec:
         {{- end }}
         {{- if .Values.syncer.readinessProbe }}
         {{- if .Values.syncer.readinessProbe.enabled }}
+        startupProbe:
+          httpGet:
+            path: /readyz
+            port: 8443
+            scheme: HTTPS
+          failureThreshold: 300
+          periodSeconds: 6
         readinessProbe:
           httpGet:
             path: /readyz