Support for ODF Worker Replace #4600
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
4 times, most recently
from
00a53d1 to
62568a6
Compare
hasan4791
suggested changes
Jun 7, 2023
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/constants.go
Outdated
Show resolved
Hide resolved
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
| func int32Ptr(i int32) *int32 { return &i } | ||
|
|
||
| // To execute a given template using the openshift go client | ||
| func ExecuteTemplate(osdID string) { |
There was a problem hiding this comment.
Lets discuss this function over webex once.
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
hasan4791
reviewed
Jun 7, 2023
ibm/service/kubernetes/utils/softwaredefinedsolution/odfWorkerReplace.go
Outdated
Show resolved
Hide resolved
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
from
62568a6 to
ef430ad
Compare
hasan4791
reviewed
Jun 9, 2023
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
2 times, most recently
from
9b8b7bf to
863a5e1
Compare
hasan4791
suggested changes
Jun 12, 2023
| @@ -635,3 +689,23 @@ func vpcClusterVpcWorkersVersionRefreshFunc(client v2.Workers, workerID, cluster | |||
| return worker, versionUpdating, nil | |||
| } | |||
| } | |||
|
|
|||
| func validateSoftwareDefinedStorage(sds string) error { | |||
| var sdsList []string = []string{"ODF", "PTX"} | |||
There was a problem hiding this comment.
Remove PTX from here and create a global/constant variable to save these strings.
| set[v] = true | ||
| } | ||
| if !set[strings.ToUpper(sds)] { | ||
| return fmt.Errorf("[ERROR] Software Defined Storage not found!") |
There was a problem hiding this comment.
On error, also print the supported values for this parameter.
| ) | ||
|
|
||
| // ODF Struct Defined | ||
| type Odf struct{} |
|
@hkantare Please take a look at this PR. I've completed odf related reviews. |
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
from
c5cffff to
5a9596c
Compare
hkantare
reviewed
Jun 13, 2023
| @@ -65,6 +71,45 @@ func ResourceIBMContainerVpcWorker() *schema.Resource { | |||
| Description: "Cluster name", | |||
| }, | |||
|
|
|||
| "sds": { | |||
| Type: schema.TypeString, | |||
There was a problem hiding this comment.
Introducing a required field wil be breaking change.
sds is a mandatory to provision a worker?
There was a problem hiding this comment.
@aayushsss1 sds parameter should be an optional field. The schema has to be similar to this "check_ptx_status" parameter
| @@ -161,10 +215,15 @@ func resourceIBMContainerVpcWorkerCreate(d *schema.ResourceData, meta interface{ | |||
| return fmt.Errorf("[ERROR] Invalid kubeconfig,, failed to create clientset: %s", err) | |||
| } | |||
| //3. List pods from kube-system namespace | |||
| _, err = clientset.CoreV1().Pods("default").List(context.TODO(), metav1.ListOptions{}) | |||
| _, err = clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{}) | |||
There was a problem hiding this comment.
Pods("") this will pods from all namespaces?
There was a problem hiding this comment.
updated it to get pods from kube-system
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
5 times, most recently
from
a5d4c03 to
72b363a
Compare
hasan4791
suggested changes
Jun 14, 2023
| @@ -65,6 +71,46 @@ func ResourceIBMContainerVpcWorker() *schema.Resource { | |||
| Description: "Cluster name", | |||
| }, | |||
|
|
|||
| "sds": { | |||
| Type: schema.TypeString, | |||
| Required: true, | |||
There was a problem hiding this comment.
Its still showing required!!
| Required: true, | ||
| ForceNew: true, | ||
| Optional: true, | ||
| Description: "Name of Software Defined Storage", |
There was a problem hiding this comment.
Also include diff supress for this parameter.
| @@ -65,6 +71,46 @@ func ResourceIBMContainerVpcWorker() *schema.Resource { | |||
| Description: "Cluster name", | |||
| }, | |||
|
|
|||
| "sds": { | |||
There was a problem hiding this comment.
"sds" & "kube_config_path" parameter are dependent to each other. So update the schema with "RequiredWith" also.
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
from
72b363a to
79e2978
Compare
secrets added secrets.baseline modified Example/Openshift-Data_Foundation Updated input.tfvars updated Dev note added docs reverted deployment fix docs updated mod and sum updated doc updated naming convention WaitFor functions added doc updated Review Comments added secrets and struct updated Further updates (#3) * Updates * file renamed * Return error validate function added review comments added comments removed optional field added for sds pods from kube-system secrets baseline updated sds schema updated schema updated
aayushsss1
force-pushed
the
tf-odf-worker-replace
branch
from
79e2978 to
b61ba2b
Compare
hkantare
approved these changes
Jun 14, 2023
omaraibrahim
pushed a commit
to omaraibrahim/terraform-provider-ibm
that referenced
this pull request
Jul 20, 2023
* ODF Worker Replace secrets added secrets.baseline modified Example/Openshift-Data_Foundation Updated input.tfvars updated Dev note added docs reverted deployment fix docs updated mod and sum updated doc updated naming convention WaitFor functions added doc updated Review Comments added secrets and struct updated Further updates (IBM-Cloud#3) * Updates * file renamed * Return error validate function added review comments added comments removed optional field added for sds pods from kube-system secrets baseline updated sds schema updated schema updated * schema updated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows user to easily replace worker nodes with openshift-data-foundation installed through terraform.
Community Note
Relates OR Closes #0000
Output from acceptance testing: