Skip to content

Commit

Permalink
release/V4.0 - fix(charts): fix blocklist logic (#3048)
Browse files Browse the repository at this point in the history
* fix(charts): fix blocklist logic
  • Loading branch information
jgreat authored Jan 27, 2023
1 parent 4189638 commit 6da6402
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .internal-ci/helm/consensus-node-config/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ global:
### Enable haproxy IP blocklist for ingress
# pattern is the object in the configmap shared between infra-haproxy-blocklist and haproxy kubernetes-ingress
blocklist:
enabled: false
enabled: "false"
pattern: patterns/blocked-countries
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
{{- if .Values.node.client.attest.rateLimits.enabled }}
{{- toYaml .Values.node.client.attest.rateLimits.annotations | nindent 4 }}
{{- end }}
{{- if (include "consensusNode.blocklist.enabled" .) }}
{{- if eq (include "consensusNode.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "consensusNode.blocklist.pattern" . }}
{{- end }}
{{- toYaml .Values.node.client.ingress.annotations | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "consensusNode.blocklist.enabled" .) }}
{{- if eq (include "consensusNode.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "consensusNode.blocklist.pattern" . }}
{{- end }}
{{- toYaml .Values.node.client.ingress.annotations | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "consensusNode.blocklist.enabled" .) }}
{{- if eq (include "consensusNode.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "consensusNode.blocklist.pattern" . }}
{{- end }}
{{- toYaml .Values.node.peer.ingress.annotations | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion .internal-ci/helm/consensus-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ global:
# { json }

blocklist:
enabled: false
enabled: "false"
pattern: patterns/blocked-countries

### Enable to launch child chart to create node required configMaps and secrets.
Expand Down
2 changes: 1 addition & 1 deletion .internal-ci/helm/fog-services-config/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fullnameOverride: ''
# Shared by all charts in the dependency tree
global:
blocklist:
enabled: false
enabled: "false"
pattern: patterns/blocked-countries

fogRecoveryDatabaseReader:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" .) }}
{{- if eq (include "fogServices.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" . }}
{{- end }}
{{ toYaml (tpl .Values.fogLedger.ingress.grpc.annotations . | fromYaml) | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" .) }}
{{- if eq (include "fogServices.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" . }}
{{- end }}
{{ toYaml (tpl .Values.fogLedger.ingress.http.annotations . | fromYaml) | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
{{- if $.Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ $.Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" $) }}
{{- if eq (include "fogServices.blocklist.enabled" $) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" $ }}
{{- end }}
{{- toYaml $.Values.fogReport.ingress.grpc.annotations | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
{{- if $.Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ $.Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" $) }}
{{- if eq (include "fogServices.blocklist.enabled" $) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" $ }}
{{- end }}
{{- toYaml $.Values.fogReport.ingress.http.annotations | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" .) }}
{{- if eq (include "fogServices.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" . }}
{{- end }}
{{ toYaml (tpl .Values.fogView.ingress.grpc.annotations . | fromYaml) | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
{{- if .Values.global.certManagerClusterIssuer }}
cert-manager.io/cluster-issuer: {{ .Values.global.certManagerClusterIssuer }}
{{- end }}
{{- if (include "fogServices.blocklist.enabled" .) }}
{{- if eq (include "fogServices.blocklist.enabled" .) "true" }}
haproxy.org/blacklist: {{ include "fogServices.blocklist.pattern" . }}
{{- end }}
{{ toYaml (tpl .Values.fogView.ingress.http.annotations . | fromYaml) | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion .internal-ci/helm/fog-services/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ image:
global:
certManagerClusterIssuer: letsencrypt-production-http
blocklist:
enabled: false
enabled: "false"
pattern: patterns/blocked-countries

### Fog Report Service
Expand Down

0 comments on commit 6da6402

Please sign in to comment.