Skip to content

Added enablePublicEndpoint environmental variable to IBM Cloud deployment file #148

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 22, 2021
Merged

Added enablePublicEndpoint environmental variable to IBM Cloud deployment file #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/cloud/ibm/assets/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ spec:
fieldPath: status.podIP
- name: VPCCTL_CLOUD_CONFIG
value: /etc/ibm/cloud.conf
- name: VPCCTL_PUBLIC_ENDPOINT
value: {{ .enablePublicEndpoint }}
command:
- /bin/bash
- -c
Expand Down
25 changes: 21 additions & 4 deletions pkg/cloud/ibm/ibm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"embed"
"fmt"

configv1 "github.com/openshift/api/config/v1"

"github.com/asaskevich/govalidator"
appsv1 "k8s.io/api/apps/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -27,7 +29,8 @@ type imagesReference struct {
}

var templateValuesValidationMap = map[string]interface{}{
"images": "required",
"images": "required",
"enablePublicEndpoint": "required",
}

type ibmAssets struct {
Expand All @@ -39,9 +42,10 @@ func (assets *ibmAssets) GetRenderedResources() []client.Object {
return assets.renderedResources
}

func getTemplateValues(images *imagesReference) (common.TemplateValues, error) {
func getTemplateValues(images *imagesReference, operatorConfig config.OperatorConfig) (common.TemplateValues, error) {
values := common.TemplateValues{
"images": images,
"images": images,
"enablePublicEndpoint": fmt.Sprintf("%t", getEnablePublicEndpointValue(operatorConfig)),
}
_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
if err != nil {
Expand All @@ -50,6 +54,19 @@ func getTemplateValues(images *imagesReference) (common.TemplateValues, error) {
return values, nil
}

func getEnablePublicEndpointValue(operatorConfig config.OperatorConfig) bool {
if operatorConfig.PlatformStatus == nil {
return false
}
switch operatorConfig.PlatformStatus.Type {
case configv1.PowerVSPlatformType:
// For Power VS Platform enable public endpoints
return true
default:
return false
}
}

func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets, error) {
images := &imagesReference{
CloudControllerManager: config.ImagesReference.CloudControllerManagerIBM,
Expand All @@ -66,7 +83,7 @@ func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets
if err != nil {
return nil, err
}
templateValues, err := getTemplateValues(images)
templateValues, err := getTemplateValues(images, config)
if err != nil {
return nil, fmt.Errorf("can not construct template values for %s assets: %v", providerName, err)
}
Expand Down