Skip to content

Commit d6b6868

Browse files
committed
Merge branch 'improvement/ARTESCA-15196-salt-http-request-interval' into tmp/octopus/w/131.0/improvement/ARTESCA-15196-salt-http-request-interval
2 parents 8e06444 + 49cac6d commit d6b6868

File tree

12 files changed

+17
-0
lines changed

12 files changed

+17
-0
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
## Release 130.0.1 (in development)
66

7+
### Enhancements
8+
9+
- Add 1 second request interval on every salt call using http.wait_for_successful_query
10+
(PR[#4609](https://github.com/scality/metalk8s/pull/4609))
11+
712
## Release 130.0.0
813

914
### Enhancements

salt/metalk8s/kubernetes/apiserver-proxy/installed.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Make sure apiserver-proxy is available:
3838
http.wait_for_successful_query:
3939
- name: http://127.0.0.1:7080/healthz
4040
- status: 200
41+
- request_interval: 1
4142
- require:
4243
- module: Delay after apiserver-proxy deployment
4344

salt/metalk8s/kubernetes/apiserver/installed.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,5 +181,6 @@ Make sure kube-apiserver container is up and ready:
181181
- ca_bundle: /etc/kubernetes/pki/ca.crt
182182
- status: 200
183183
- match: 'ok'
184+
- request_interval: 1
184185
- require:
185186
- module: Make sure kube-apiserver container is up and ready

salt/metalk8s/kubernetes/etcd/installed.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Waiting for etcd running:
115115
- /etc/kubernetes/pki/etcd/server.key
116116
- status: 200
117117
- match: '{"health":"true","reason":""}'
118+
- request_interval: 1
118119
- require:
119120
- module: Delay after etcd pod deployment
120121

salt/metalk8s/orchestrate/bootstrap/init.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Wait for API server to be available:
115115
- match: 'ok'
116116
- status: 200
117117
- verify_ssl: false
118+
- request_interval: 1
118119
- require:
119120
- salt: Bring bootstrap minion to highstate
120121

salt/metalk8s/orchestrate/bootstrap/pre-downgrade.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ Wait for an API server to be available through local proxy:
2626
- match: 'ok'
2727
- status: 200
2828
- verify_ssl: false
29+
- request_interval: 1
2930
- require:
3031
- salt: Prepare for Salt Master downgrade

salt/metalk8s/orchestrate/bootstrap/pre-upgrade.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ Wait for an API server to be available through local proxy:
2525
- match: 'ok'
2626
- status: 200
2727
- verify_ssl: false
28+
- request_interval: 1
2829
- require:
2930
- salt: Prepare for Salt Master upgrade

salt/metalk8s/orchestrate/deploy_node.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ Wait for API server to be available before highstate:
254254
- match: 'ok'
255255
- status: 200
256256
- verify_ssl: false
257+
- request_interval: 1
257258
258259
Check pillar before highstate:
259260
salt.function:
@@ -299,6 +300,7 @@ Wait for API server to be available:
299300
- match: 'ok'
300301
- status: 200
301302
- verify_ssl: false
303+
- request_interval: 1
302304
303305
Uncordon the node:
304306
metalk8s_cordon.node_uncordoned:

salt/metalk8s/orchestrate/downgrade/init.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Wait for API server to be available on {{ node }}:
3434
- match: 'ok'
3535
- status: 200
3636
- verify_ssl: false
37+
- request_interval: 1
3738
- require:
3839
- salt: Execute the downgrade prechecks
3940
{%- if loop.previtem is defined %}

salt/metalk8s/orchestrate/upgrade/init.sls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ Wait for API server to be available on {{ node }}:
6262
- match: 'ok'
6363
- status: 200
6464
- verify_ssl: false
65+
- request_interval: 1
6566
- require:
6667
- salt: Install apiserver-proxy on {{ node }}
6768

0 commit comments

Comments
 (0)