Skip to content

Commit 631c639

Browse files
ixxeL2097Frederic Spiers
andauthored
fix(helm): add argocd annotation to ignore progressing proxy pods when readiness probe is not healthy (#81)
Co-authored-by: Frederic Spiers <[email protected]>
1 parent a8e0e09 commit 631c639

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

helm/ggbridge/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ A Helm chart for installing ggbridge
7575
| podSecurityContext.enabled | bool | `true` | Enable Pod security Context in deployments |
7676
| proxy.affinity | object | `{}` | Affinity for pod assignment |
7777
| proxy.annotations | object | `{}` | Set proxy annotations |
78+
| proxy.argocd.ignoreHealthcheck | bool | `true` | Ignore Deployment healthcheck during ArgoCD sync operations |
7879
| proxy.config | object | `{"server":{"customDirectives":[],"proxyConnectTimeout":"30s","proxyTimeout":"1800s"},"upstream":{"backupMode":false,"downServers":[],"failTimeout":"120s","healthLoadBalancing":false,"maxFails":2}}` | Nginx configuration |
7980
| proxy.config.server | object | `{"customDirectives":[],"proxyConnectTimeout":"30s","proxyTimeout":"1800s"}` | Nginx server section configuration |
8081
| proxy.config.server.customDirectives | list | `[]` | custom parameters to add to the 'server' section of nginx.conf you need to choose which section it applies to can be "health", "socks", "web" or "tls" |

helm/ggbridge/templates/proxy/deployment.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ metadata:
1212
labels:
1313
{{- include "ggbridge.labels" $ | nindent 4 }}
1414
{{- include "ggbridge.proxy.labels" $ | nindent 4 }}
15-
{{- if or $.Values.commonAnnotations $.Values.proxy.annotations }}
16-
{{- $annotations := include "ggbridge.tplvalues.merge" ( dict "values" ( list $.Values.proxy.annotations $.Values.commonAnnotations ) "context" $ ) }}
15+
{{- $argocdAnnotation := dict }}
16+
{{- if $.Values.proxy.argocd.ignoreHealthcheck }}
17+
{{- $_ := set $argocdAnnotation "argocd.argoproj.io/ignore-healthcheck" "true" }}
18+
{{- end }}
19+
{{- $annotations := include "ggbridge.tplvalues.merge" ( dict "values" ( list $.Values.proxy.annotations $.Values.commonAnnotations $argocdAnnotation ) "context" $ ) }}
20+
{{- if $annotations }}
1721
annotations: {{- include "ggbridge.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
1822
{{- end }}
1923
spec:

helm/ggbridge/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,10 @@ proxy:
395395
# -- Set proxy labels
396396
labels: {}
397397

398+
argocd:
399+
# -- Ignore Deployment healthcheck during ArgoCD sync operations
400+
ignoreHealthcheck: true
401+
398402
# -- Nginx configuration
399403
config:
400404
# -- Nginx server section configuration

0 commit comments

Comments
 (0)