File tree Expand file tree Collapse file tree 4 files changed +48
-1
lines changed
tests/integration/targets/k8s_waiter Expand file tree Collapse file tree 4 files changed +48
-1
lines changed Original file line number Diff line number Diff line change
1
+ bugfixes :
2
+ - waiter - Fix waiting for daemonset when desired number of pods is 0. (https://github.com/ansible-collections/kubernetes.core/pull/756).
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ def daemonset_ready(daemonset: ResourceInstance) -> bool:
51
51
return bool (
52
52
daemonset .status
53
53
and daemonset .status .desiredNumberScheduled is not None
54
- and daemonset .status .updatedNumberScheduled
54
+ and ( daemonset .status .updatedNumberScheduled or 0 )
55
55
== daemonset .status .desiredNumberScheduled
56
56
and daemonset .status .numberReady == daemonset .status .desiredNumberScheduled
57
57
and daemonset .status .observedGeneration == daemonset .metadata .generation
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ k8s_pod_metadata:
5
5
6
6
k8s_pod_spec :
7
7
serviceAccount : " {{ k8s_pod_service_account }}"
8
+ nodeSelector : " {{ k8s_pod_node_selector }}"
8
9
containers :
9
10
- image : " {{ k8s_pod_image }}"
10
11
imagePullPolicy : Always
@@ -33,6 +34,8 @@ k8s_pod_ports: []
33
34
34
35
k8s_pod_env : []
35
36
37
+ k8s_pod_node_selector : {}
38
+
36
39
k8s_pod_template :
37
40
metadata : " {{ k8s_pod_metadata }}"
38
41
spec : " {{ k8s_pod_spec }}"
Original file line number Diff line number Diff line change 127
127
- ds.result.status.currentNumberScheduled == ds.result.status.desiredNumberScheduled
128
128
- updated_ds_pods.resources[0].spec.containers[0].image.endswith(":3")
129
129
130
+ - name : Create daemonset with nodeSelector and not existing label
131
+ k8s :
132
+ definition :
133
+ apiVersion : apps/v1
134
+ kind : DaemonSet
135
+ metadata :
136
+ name : wait-daemonset-not-existing-label
137
+ namespace : " {{ wait_namespace }}"
138
+ spec :
139
+ selector :
140
+ matchLabels :
141
+ app : " {{ k8s_pod_name }}"
142
+ template : " {{ k8s_pod_template }}"
143
+ wait : yes
144
+ wait_sleep : 5
145
+ wait_timeout : " {{ k8s_wait_timeout | default(omit) }}"
146
+ vars :
147
+ k8s_pod_name : wait-daemonset-not-existing-label
148
+ k8s_pod_image : gcr.io/kuar-demo/kuard-amd64:1
149
+ k8s_pod_command :
150
+ - sleep
151
+ - " 600"
152
+ k8s_pod_node_selector :
153
+ nonExisitingLabel : test-not-exiting-label
154
+ register : ds_not_existing_label
155
+
156
+ - name : Get updated pods
157
+ k8s_info :
158
+ api_version : v1
159
+ kind : Pod
160
+ namespace : " {{ wait_namespace }}"
161
+ label_selectors :
162
+ - app=wait-daemonset-not-existing-label
163
+ register : updated_ds_pods_not_existing_label
164
+
165
+ - name : Check that daemonset wait worked (when desired number is 0)
166
+ assert :
167
+ that :
168
+ - ds_not_existing_label.result.status.currentNumberScheduled == ds_not_existing_label.result.status.desiredNumberScheduled
169
+ - ds_not_existing_label.result.status.desiredNumberScheduled == 0
170
+ - updated_ds_pods_not_existing_label.resources | length == 0
171
+
130
172
- name : Add a statefulset
131
173
k8s :
132
174
definition :
You can’t perform that action at this time.
0 commit comments