kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update handling of bool values for Canal

This commit is contained in:
Ciprian Hacman 2021-10-24 09:04:35 +03:00
parent 77772b6441
commit 35c3dfcbc5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template
View File

@ -3820,7 +3820,7 @@ spec:
- name: TYPHA_HEALTHENABLED - name: TYPHA_HEALTHENABLED
value: "true" value: "true"
- name: TYPHA_PROMETHEUSMETRICSENABLED - name: TYPHA_PROMETHEUSMETRICSENABLED
value: "{{- or .Networking.Canal.TyphaPrometheusMetricsEnabled "false" }}" value: "{{- .Networking.Canal.TyphaPrometheusMetricsEnabled }}"
- name: TYPHA_PROMETHEUSMETRICSPORT - name: TYPHA_PROMETHEUSMETRICSPORT
value: "{{- or .Networking.Canal.TyphaPrometheusMetricsPort "9093" }}" value: "{{- or .Networking.Canal.TyphaPrometheusMetricsPort "9093" }}"
livenessProbe: livenessProbe:
@ -4032,16 +4032,16 @@ spec:
value: "{{- or .Networking.Canal.LogSeveritySys "info" }}" value: "{{- or .Networking.Canal.LogSeveritySys "info" }}"
# Set to enable the experimental Prometheus metrics server # Set to enable the experimental Prometheus metrics server
- name: FELIX_PROMETHEUSMETRICSENABLED - name: FELIX_PROMETHEUSMETRICSENABLED
value: "{{- or .Networking.Canal.PrometheusMetricsEnabled "false" }}" value: "{{- .Networking.Canal.PrometheusMetricsEnabled }}"
# TCP port that the Prometheus metrics server should bind to # TCP port that the Prometheus metrics server should bind to
- name: FELIX_PROMETHEUSMETRICSPORT - name: FELIX_PROMETHEUSMETRICSPORT
value: "{{- or .Networking.Canal.PrometheusMetricsPort "9091" }}" value: "{{- or .Networking.Canal.PrometheusMetricsPort "9091" }}"
# Enable Prometheus Go runtime metrics collection # Enable Prometheus Go runtime metrics collection
- name: FELIX_PROMETHEUSGOMETRICSENABLED - name: FELIX_PROMETHEUSGOMETRICSENABLED
value: "{{- or .Networking.Canal.PrometheusGoMetricsEnabled "true" }}" value: "{{- .Networking.Canal.PrometheusGoMetricsEnabled }}"
# Enable Prometheus process metrics collection # Enable Prometheus process metrics collection
- name: FELIX_PROMETHEUSPROCESSMETRICSENABLED - name: FELIX_PROMETHEUSPROCESSMETRICSENABLED
value: "{{- or .Networking.Canal.PrometheusProcessMetricsEnabled "true" }}" value: "{{- .Networking.Canal.PrometheusProcessMetricsEnabled }}"
securityContext: securityContext:
privileged: true privileged: true
resources: resources:
@ -4124,7 +4124,7 @@ spec:
configMapKeyRef: configMapKeyRef:
name: canal-config name: canal-config
key: masquerade key: masquerade
{{- if eq .Networking.Canal.DisableFlannelForwardRules true }} {{- if .Networking.Canal.DisableFlannelForwardRules }}
- name: FLANNELD_IPTABLES_FORWARD_RULES - name: FLANNELD_IPTABLES_FORWARD_RULES
value: "false" value: "false"
{{- end }} {{- end }}