Skip to content

Commit 08f5897

Browse files
committed
manifests: quote the "{node,pod}_name" Jinja variables in YAML
Jinja is not aware of what it is templating. So it does not know that we want to set a string in YAML, or how to quote that. Luckily, we already ensure that the node name is a valid DNS name. The form of the pod name is even more strict. So they cannot contain quotes that could break our YAML. Still, a node name "1" would be interpreted as a plain number in YAML. We always want a YAML string. Quote the value in the template. In this case, this is safe, because we know that the node name and the pod name only contain certain characters.
1 parent 37c8c26 commit 08f5897

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

manifests/host-pod.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
namespace: {{ name_space }}
5-
name: {{ pod_name }}
5+
name: "{{ pod_name }}"
66
labels:
77
tft-tests: "{{ index }}"
88
tft-port: "{{ port }}"
99
spec:
1010
hostNetwork: true
1111
dnsPolicy: ClusterFirstWithHostNet
1212
nodeSelector:
13-
kubernetes.io/hostname: {{ node_name }}
13+
kubernetes.io/hostname: "{{ node_name }}"
1414
containers:
15-
- name: {{ pod_name }}
15+
- name: "{{ pod_name }}"
1616
image: {{ test_image }}
1717
command: {{ command }}
1818
args: {{ args }}

manifests/pod-secondary-network.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
namespace: {{ name_space }}
5-
name: {{ pod_name }}
5+
name: "{{ pod_name }}"
66
labels:
77
tft-tests: "{{ index }}"
88
tft-port: "{{ port }}"
99
annotations:
1010
k8s.v1.cni.cncf.io/networks: {{ secondary_network_nad }}
1111
spec:
1212
nodeSelector:
13-
kubernetes.io/hostname: {{ node_name }}
13+
kubernetes.io/hostname: "{{ node_name }}"
1414
containers:
15-
- name: {{ pod_name }}
15+
- name: "{{ pod_name }}"
1616
image: {{ test_image }}
1717
command: {{ command }}
1818
args: {{ args }}

manifests/pod.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
namespace: {{ name_space }}
5-
name: {{ pod_name }}
5+
name: "{{ pod_name }}"
66
labels:
77
tft-tests: "{{ index }}"
88
tft-port: "{{ port }}"
99
spec:
1010
nodeSelector:
11-
kubernetes.io/hostname: {{ node_name }}
11+
kubernetes.io/hostname: "{{ node_name }}"
1212
containers:
13-
- name: {{ pod_name }}
13+
- name: "{{ pod_name }}"
1414
image: {{ test_image }}
1515
command: {{ command }}
1616
args: {{ args }}

manifests/sriov-pod.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
namespace: {{ name_space }}
5-
name: {{ pod_name }}
5+
name: "{{ pod_name }}"
66
annotations: {% if not use_secondary_network %}
77
v1.multus-cni.io/default-network: {{ default_network }} {% else %}
88
k8s.v1.cni.cncf.io/networks: {{ secondary_network_nad }} {% endif %}
@@ -11,9 +11,9 @@ metadata:
1111
tft-port: "{{ port }}"
1212
spec:
1313
nodeSelector:
14-
kubernetes.io/hostname: {{ node_name }}
14+
kubernetes.io/hostname: "{{ node_name }}"
1515
containers:
16-
- name: {{ pod_name }}
16+
- name: "{{ pod_name }}"
1717
image: {{ test_image }}
1818
command: {{ command }}
1919
args: {{ args }}

manifests/tools-pod.yaml.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
namespace: {{ name_space }}
5-
name: {{ pod_name }}
5+
name: "{{ pod_name }}"
66
labels:
77
tft-tests: "{{ index }}"
88
spec:
99
nodeSelector:
10-
kubernetes.io/hostname: {{ node_name }}
10+
kubernetes.io/hostname: "{{ node_name }}"
1111
hostNetwork: true
1212
containers:
13-
- name: {{ pod_name }}
13+
- name: "{{ pod_name }}"
1414
image: {{ test_image }}
1515
command: {{ command }}
1616
args: {{ args }}

0 commit comments

Comments
 (0)