update cloud provider to use folder from platform #3473
Conversation
|
/retest |
| @@ -27,7 +27,7 @@ func CloudProviderConfig(clusterName string, p *vspheretypes.Platform) (string, | |||
| printIfNotEmpty(buf, "server", p.VCenter) | |||
| printIfNotEmpty(buf, "datacenter", p.Datacenter) | |||
| printIfNotEmpty(buf, "default-datastore", p.DefaultDatastore) | |||
| printIfNotEmpty(buf, "folder", clusterName) | |||
| printIfNotEmpty(buf, "folder", p.Folder) | |||
There was a problem hiding this comment.
@dav1x can you make one change?
if p.Folder is empty use clusterName
dav1x
force-pushed
the
vmw-platform-folder
branch
from
305cb1b
to
7fa45a9
Compare
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcpowermac The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/test e2e-vpshere-upi |
|
@abhinavdahiya: The specified target(s) for
Use In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
| printIfNotEmpty(buf, "folder", p.Folder) | ||
| if p.Folder == "" { | ||
| printIfNotEmpty(buf, "folder", clusterName) | ||
| } |
There was a problem hiding this comment.
why do we have 2 prints for the same field? wouldn't that be incorrect??
folder = ""
folder = "clustername"
There was a problem hiding this comment.
@abhinavdahiya this is what we were talking about at the end of grooming.
If Folder is empty we will continue to use clusterName.
There was a problem hiding this comment.
printIfNotEmpty checks if the value is ""
|
/test e2e-vsphere-upi |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@dav1x: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
Cloud provider still uses cluster name for folder. Platform does include folder from install-config:
https://github.com/openshift/installer/blob/release-4.4/pkg/types/vsphere/platform.go#L22
But, the cloud provider still uses cluster name:
https://github.com/openshift/installer/blob/release-4.4/pkg/asset/manifests/vsphere/cloudproviderconfig.go#L30 (edited)