Skip to content

Commit

Permalink
Merge branch 'bugfix/bump-attempts-check-object-ready' into tmp/octop…
Browse files Browse the repository at this point in the history
…us/w/127.0/bugfix/bump-attempts-check-object-ready
  • Loading branch information
bert-e committed Nov 15, 2023
2 parents 473a226 + 4a45ce6 commit 5299e9a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
that prevents re-run of the bootstrap script if it fails at a specific point
(PR[4196](https://github.com/scality/metalk8s/pull/4196))

- Bump the attempts to wait for the Operator and ClusterConfig
to be Ready
(PR[#4199](https://github.com/scality/metalk8s/pull/4199))

## Release 126.0.1

### Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions salt/metalk8s/addons/metalk8s-operator/deployed/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Wait for the MetalK8s Operator to be Ready:
name=metalk8s-operator-controller-manager, namespace=kube-system)
- comment: Wait for the MetalK8s Operator to be Ready
- retry:
attempts: 10
attempts: 30
- require:
- sls: metalk8s.addons.metalk8s-operator.deployed.manifests

Expand All @@ -21,6 +21,6 @@ Wait for the ClusterConfig to be Ready:
name=main)
- comment: Wait for the ClusterConfig to be Ready
- retry:
attempts: 10
attempts: 30
- require:
- test: Wait for the MetalK8s Operator to be Ready

0 comments on commit 5299e9a

Please sign in to comment.