Backport goldpinger changes

replicatedhq · Dec 14, 2023 · 1e37c28 · 1e37c28
1 parent fcf3a78
commit 1e37c28
Show file tree

Hide file tree

Showing 24 changed files with 72 additions and 10 deletions.
diff --git a/addons/goldpinger/3.2.0-4.1.1/goldpinger.yaml b/addons/goldpinger/3.2.0-4.1.1/goldpinger.yaml
@@ -86,7 +86,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
       - name: goldpinger-daemon
@@ -107,6 +107,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: PING_TIMEOUT_MS
+            value: 2000
+          - name: CHECK_TIMEOUT_MS
+            value: 3000
+          - name: CHECK_ALL_TIMEOUT_MS
+            value: 10000
         ports:
         - name: http
           containerPort: 80

diff --git a/addons/goldpinger/3.2.0-4.1.1/install.sh b/addons/goldpinger/3.2.0-4.1.1/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.2.0-4.1.1/kustomization.yaml b/addons/goldpinger/3.2.0-4.1.1/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.2.0-4.2.1/goldpinger.yaml b/addons/goldpinger/3.2.0-4.2.1/goldpinger.yaml
@@ -86,7 +86,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
       - name: goldpinger-daemon
@@ -107,6 +107,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: PING_TIMEOUT_MS
+            value: 2000
+          - name: CHECK_TIMEOUT_MS
+            value: 3000
+          - name: CHECK_ALL_TIMEOUT_MS
+            value: 10000
         ports:
         - name: http
           containerPort: 80

diff --git a/addons/goldpinger/3.2.0-4.2.1/install.sh b/addons/goldpinger/3.2.0-4.2.1/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.2.0-4.2.1/kustomization.yaml b/addons/goldpinger/3.2.0-4.2.1/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.2.0-5.0.0/goldpinger.yaml b/addons/goldpinger/3.2.0-5.0.0/goldpinger.yaml
@@ -91,7 +91,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
       - name: goldpinger-daemon
@@ -112,6 +112,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: PING_TIMEOUT_MS
+            value: 2000
+          - name: CHECK_TIMEOUT_MS
+            value: 3000
+          - name: CHECK_ALL_TIMEOUT_MS
+            value: 10000
         ports:
         - name: http
           containerPort: 80

diff --git a/addons/goldpinger/3.2.0-5.0.0/install.sh b/addons/goldpinger/3.2.0-5.0.0/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.2.0-5.0.0/kustomization.yaml b/addons/goldpinger/3.2.0-5.0.0/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.3.0-5.1.0/goldpinger.yaml b/addons/goldpinger/3.3.0-5.1.0/goldpinger.yaml
@@ -91,7 +91,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
       - name: goldpinger-daemon
@@ -112,6 +112,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: PING_TIMEOUT_MS
+            value: 2000
+          - name: CHECK_TIMEOUT_MS
+            value: 3000
+          - name: CHECK_ALL_TIMEOUT_MS
+            value: 10000
         ports:
         - name: http
           containerPort: 80

diff --git a/addons/goldpinger/3.3.0-5.1.0/install.sh b/addons/goldpinger/3.3.0-5.1.0/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.3.0-5.1.0/kustomization.yaml b/addons/goldpinger/3.3.0-5.1.0/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.5.1-5.2.0/goldpinger.yaml b/addons/goldpinger/3.5.1-5.2.0/goldpinger.yaml
@@ -91,7 +91,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
       - name: goldpinger-daemon
@@ -112,6 +112,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: PING_TIMEOUT_MS
+            value: 2000
+          - name: CHECK_TIMEOUT_MS
+            value: 3000
+          - name: CHECK_ALL_TIMEOUT_MS
+            value: 10000
         ports:
         - name: http
           containerPort: 80

diff --git a/addons/goldpinger/3.5.1-5.2.0/install.sh b/addons/goldpinger/3.5.1-5.2.0/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.5.1-5.2.0/kustomization.yaml b/addons/goldpinger/3.5.1-5.2.0/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.6.1-5.4.2/goldpinger.yaml b/addons/goldpinger/3.6.1-5.4.2/goldpinger.yaml
@@ -91,7 +91,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
         - name: goldpinger-daemon
@@ -112,6 +112,12 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: PING_TIMEOUT
+              value: 2s
+            - name: CHECK_TIMEOUT
+              value: 3s
+            - name: CHECK_ALL_TIMEOUT
+              value: 10s
           ports:
             - name: http
               containerPort: 80

diff --git a/addons/goldpinger/3.6.1-5.4.2/install.sh b/addons/goldpinger/3.6.1-5.4.2/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.6.1-5.4.2/kustomization.yaml b/addons/goldpinger/3.6.1-5.4.2/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.7.0-5.5.0/goldpinger.yaml b/addons/goldpinger/3.7.0-5.5.0/goldpinger.yaml
@@ -105,7 +105,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
         - name: goldpinger-daemon
@@ -125,11 +125,16 @@ spec:
               value: "80"
             - name: LABEL_SELECTOR
               value: "app.kubernetes.io/name=goldpinger"
-
             - name: POD_IP
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: PING_TIMEOUT
+              value: 2s
+            - name: CHECK_TIMEOUT
+              value: 3s
+            - name: CHECK_ALL_TIMEOUT
+              value: 10s
           ports:
             - name: http
               containerPort: 80

diff --git a/addons/goldpinger/3.7.0-5.5.0/install.sh b/addons/goldpinger/3.7.0-5.5.0/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.7.0-5.5.0/kustomization.yaml b/addons/goldpinger/3.7.0-5.5.0/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
diff --git a/addons/goldpinger/3.7.0-5.6.0/goldpinger.yaml b/addons/goldpinger/3.7.0-5.6.0/goldpinger.yaml
@@ -105,7 +105,7 @@ spec:
         app.kubernetes.io/name: goldpinger
         app.kubernetes.io/instance: goldpinger
     spec:
-      priorityClassName: 
+      priorityClassName:
       serviceAccountName: goldpinger
       containers:
         - name: goldpinger-daemon
@@ -125,11 +125,16 @@ spec:
               value: "80"
             - name: LABEL_SELECTOR
               value: "app.kubernetes.io/name=goldpinger"
-
             - name: POD_IP
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+            - name: PING_TIMEOUT
+              value: 2s
+            - name: CHECK_TIMEOUT
+              value: 3s
+            - name: CHECK_ALL_TIMEOUT
+              value: 10s
           ports:
             - name: http
               containerPort: 80

diff --git a/addons/goldpinger/3.7.0-5.6.0/install.sh b/addons/goldpinger/3.7.0-5.6.0/install.sh
@@ -6,6 +6,7 @@ function goldpinger() {
     cp "$src/kustomization.yaml" "$dst/"
     cp "$src/goldpinger.yaml" "$dst/"
     cp "$src/servicemonitor.yaml" "$dst/"
+    cp "$src/troubleshoot.yaml" "$dst/"
 
     if [ -n "${PROMETHEUS_VERSION}" ]; then
         insert_resources "$dst/kustomization.yaml" servicemonitor.yaml

diff --git a/addons/goldpinger/3.7.0-5.6.0/kustomization.yaml b/addons/goldpinger/3.7.0-5.6.0/kustomization.yaml
@@ -2,3 +2,4 @@ namespace: kurl
 
 resources:
 - goldpinger.yaml
+- troubleshoot.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ namespace: kurl

		resources:
		- goldpinger.yaml
		- troubleshoot.yaml