Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add entitlement option to Satellite cluster/workerpool create #4894

Merged
merged 5 commits into from Nov 16, 2023

Conversation

TwoDCube
Copy link
Contributor

@TwoDCube TwoDCube commented Oct 30, 2023

We shipped a new feature to allow setting the entitlement of worker pools for Satellite Clusters. This PR is to make this change available in Terraform as well. The change in the API is available in all production regions.

Community Note

  • Please vote on this pull request by adding a 馃憤 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Relates OR Closes #0000

Output from acceptance testing:

% make testacc TEST='./ibm/service/satellite/...' TESTARGS='-run=TestAccSatelliteCluster_Entitlement'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./ibm/service/satellite/... -v -run=TestAccSatelliteCluster_Entitlement -timeout 700m
[...]
=== RUN   TestAccSatelliteCluster_Entitlement
--- PASS: TestAccSatelliteCluster_Entitlement (6586.04s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/satellite       6587.124s

% make testacc TEST='./ibm/service/satellite/...' TESTARGS='-run=TestAccSatelliteClusterWorkerPool_Entitlement'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./ibm/service/satellite/... -v -run=TestAccSatelliteClusterWorkerPool_Entitlement -timeout 700m
[...]
=== RUN   TestAccSatelliteClusterWorkerPool_Entitlement
--- PASS: TestAccSatelliteClusterWorkerPool_Entitlement (5445.76s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/satellite       5446.898s

@@ -50,6 +50,7 @@ Review the argument references that you can specify for your resource.
- `location` - (Required, String) The name or ID of the Satellite location.
- `kube_version` - (Optional, String) The Red Hart OpenShift Container Platform version.
- `operating_system` - (Optional, String) Operating system of the default worker pool. Options are REDHAT_7_64, REDHAT_8_64, or RHCOS.
- `entitlement` - (Optional, String) Entitlement reduces additional OCP Licence cost in OpenShift clusters. Use Cloud Pak with OCP Licence entitlement to create the OpenShift cluster. **Note** <ul><li> It is set only when the first time creation of the cluster, further modifications are not impacted. </li></ul> <ul><li> Set this argument to `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.</li></ul>.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was copied from here, as this option has the exact same behavior as with vpc clusters.

- `entitlement` - (Optional, String) Entitlement reduces additional OCP Licence cost in OpenShift clusters. Use Cloud Pak with OCP Licence entitlement to create the OpenShift cluster. **Note** <ul><li> It is set only when the first time creation of the cluster, further modifications are not impacted. </li></ul> <ul><li> Set this argument to `cloud_pak` only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.</li></ul>.

Also, the docs for satellite_cluster_workerpool already included the entitlement option, even though the code did not support it.

@TwoDCube TwoDCube marked this pull request as ready for review November 9, 2023 03:02
@hkantare hkantare merged commit 2aad24a into IBM-Cloud:master Nov 16, 2023
2 checks passed
@TwoDCube TwoDCube deleted the add-satellite-entitlement branch November 16, 2023 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants