Skip to content

Commit 1c068e2

Browse files
[occm] don't error on unsupported octavia provider (#1363)
Co-authored-by: Andrew Karpow <[email protected]>
1 parent 0910788 commit 1c068e2

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/pr.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Lint Charts
22

3-
on: pull_request
3+
on:
4+
pull_request:
5+
branches:
6+
- master
47

58
jobs:
69
lint:

docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Although the openstack-cloud-controller-manager was initially implemented with N
176176
The load balancing algorithm used to create the load balancer pool. The value can be `ROUND_ROBIN`, `LEAST_CONNECTIONS`, or `SOURCE_IP`. Default: `ROUND_ROBIN`
177177
178178
* `lb-provider`
179-
Optional. Used to specify the provider of the load balancer, e.g. "amphora" or "octavia".
179+
Optional. Used to specify the provider of the load balancer, e.g. "amphora" or "octavia". Only "amphora" or "octavia" provider are officially tested, other provider will cause a warning log.
180180
181181
* `lb-version`
182182
Optional. If specified, only "v2" is supported.

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ func ReadConfig(config io.Reader) (Config, error) {
416416
}
417417

418418
if !util.Contains(supportedLBProvider, cfg.LoadBalancer.LBProvider) {
419-
return Config{}, fmt.Errorf("Unsupported LoadBalancer Provider: %s", cfg.LoadBalancer.LBProvider)
419+
klog.Warningf("Unsupported LoadBalancer Provider: %s", cfg.LoadBalancer.LBProvider)
420420
}
421421

422422
return cfg, err

0 commit comments

Comments
 (0)