Skip to content

Commit

Permalink
Merge pull request openshift#1919 from cjschaef/ocpbugs-34974
Browse files Browse the repository at this point in the history 
OCPBUGS-34974: IBMCloud: Add IBM Cloud Services
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Jun 10, 2024
2 parents cefcda6 + 5caa603 commit a837bee
Show file tree
Hide file tree
Showing 30 changed files with 254 additions and 178 deletions.
2 changes: 1 addition & 1 deletion config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1399,4 +1399,4 @@ tests:
url: https://dummy.vpc.com
- name: BadService
url: https://bad-service.com
expectedStatusError: "platformStatus.ibmcloud.serviceEndpoints[1].name: Unsupported value: \"BadService\": supported values: \"CIS\", \"COS\", \"DNSServices\", \"GlobalSearch\", \"GlobalTagging\", \"HyperProtect\", \"IAM\", \"KeyProtect\", \"ResourceController\", \"ResourceManager\", \"VPC\""
expectedStatusError: "platformStatus.ibmcloud.serviceEndpoints[1].name: Unsupported value: \"BadService\": supported values: \"CIS\", \"COS\", \"COSConfig\", \"DNSServices\", \"GlobalCatalog\", \"GlobalSearch\", \"GlobalTagging\", \"HyperProtect\", \"IAM\", \"KeyProtect\", \"ResourceController\", \"ResourceManager\", \"VPC\""
6 changes: 5 additions & 1 deletion config/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,20 @@ const (

// IBMCloudServiceName contains a value specifying the name of an IBM Cloud Service,
// which are used by MAPI, CIRO, CIO, Installer, etc.
// +kubebuilder:validation:Enum=CIS;COS;DNSServices;GlobalSearch;GlobalTagging;HyperProtect;IAM;KeyProtect;ResourceController;ResourceManager;VPC
// +kubebuilder:validation:Enum=CIS;COS;COSConfig;DNSServices;GlobalCatalog;GlobalSearch;GlobalTagging;HyperProtect;IAM;KeyProtect;ResourceController;ResourceManager;VPC
type IBMCloudServiceName string

const (
// IBMCloudServiceCIS is the name for IBM Cloud CIS.
IBMCloudServiceCIS IBMCloudServiceName = "CIS"
// IBMCloudServiceCOS is the name for IBM Cloud COS.
IBMCloudServiceCOS IBMCloudServiceName = "COS"
// IBMCloudServiceCOSConfig is the name for IBM Cloud COS Config service.
IBMCloudServiceCOSConfig IBMCloudServiceName = "COSConfig"
// IBMCloudServiceDNSServices is the name for IBM Cloud DNS Services.
IBMCloudServiceDNSServices IBMCloudServiceName = "DNSServices"
// IBMCloudServiceGlobalCatalog is the name for IBM Cloud Global Catalog service.
IBMCloudServiceGlobalCatalog IBMCloudServiceName = "GlobalCatalog"
// IBMCloudServiceGlobalSearch is the name for IBM Cloud Global Search.
IBMCloudServiceGlobalSearch IBMCloudServiceName = "GlobalSearch"
// IBMCloudServiceGlobalTagging is the name for IBM Cloud Global Tagging.
Expand Down
2 changes: 1 addition & 1 deletion config/v1/types_infrastructure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ type VSpherePlatformStatus struct {
// override existing defaults of IBM Cloud Services.
type IBMCloudServiceEndpoint struct {
// name is the name of the IBM Cloud service.
// Possible values are: CIS, COS, DNSServices, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC.
// Possible values are: CIS, COS, COSConfig, DNSServices, GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController, ResourceManager, or VPC.
// For example, the IBM Cloud Private IAM service could be configured with the
// service `name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
// Whereas the IBM Cloud Private VPC service for US South (Dallas) could be configured
Expand Down
19 changes: 11 additions & 8 deletions ...nerated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1415,18 +1415,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...ted.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...ed.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1359,18 +1359,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1386,18 +1386,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1469,18 +1469,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
19 changes: 11 additions & 8 deletions ...nerated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1475,18 +1475,21 @@ spec:
properties:
name:
description: 'name is the name of the IBM Cloud service.
Possible values are: CIS, COS, DNSServices, GlobalSearch,
GlobalTagging, HyperProtect, IAM, KeyProtect, ResourceController,
ResourceManager, or VPC. For example, the IBM Cloud
Private IAM service could be configured with the service
`name` of `IAM` and `url` of `https://private.iam.cloud.ibm.com`
Whereas the IBM Cloud Private VPC service for US South
(Dallas) could be configured with the service `name`
of `VPC` and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
Possible values are: CIS, COS, COSConfig, DNSServices,
GlobalCatalog, GlobalSearch, GlobalTagging, HyperProtect,
IAM, KeyProtect, ResourceController, ResourceManager,
or VPC. For example, the IBM Cloud Private IAM service
could be configured with the service `name` of `IAM`
and `url` of `https://private.iam.cloud.ibm.com` Whereas
the IBM Cloud Private VPC service for US South (Dallas)
could be configured with the service `name` of `VPC`
and `url` of `https://us.south.private.iaas.cloud.ibm.com`'
enum:
- CIS
- COS
- COSConfig
- DNSServices
- GlobalCatalog
- GlobalSearch
- GlobalTagging
- HyperProtect
Expand Down
Loading

0 comments on commit a837bee

Please sign in to comment.