Merge branch 'devel' into dup_strings

submariner-io · Jul 24, 2024 · cdb4002 · cdb4002
2 parents 117d362 + f57f1a6
commit cdb4002
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/pkg/aws/ocpgwdeployer.go b/pkg/aws/ocpgwdeployer.go
@@ -246,8 +246,6 @@ func (d *ocpGatewayDeployer) findAMIID(vpcID string) (string, error) {
 func (d *ocpGatewayDeployer) loadGatewayYAML(gatewaySecurityGroup, amiID string, publicSubnet *types.Subnet) ([]byte, error) {
 	var buf bytes.Buffer
 
-	// TODO: Not working properly, but we should revisit this as it makes more sense
-	// tpl, err := template.ParseFiles("pkg/aws/gw-machineset.yaml.template")
 	tpl, err := template.New("").Parse(machineSetYAML)
 	if err != nil {
 		return nil, errors.Wrap(err, "error parsing machine set YAML")

diff --git a/pkg/gcp/ocpgwdeployer.go b/pkg/gcp/ocpgwdeployer.go
@@ -171,8 +171,6 @@ type machineSetConfig struct {
 func (d *ocpGatewayDeployer) loadGatewayYAML(zone, image string) ([]byte, error) {
 	var buf bytes.Buffer
 
-	// TODO: Not working properly, but we should revisit this as it makes more sense
-	// tpl, err := template.ParseFiles("pkg/aws/gw-machineset.yaml.template")
 	tpl, err := template.New("").Parse(machineSetYAML)
 	if err != nil {
 		return nil, errors.Wrap(err, "error parsing machine set YAML")

diff --git a/pkg/rhos/ocpgwdeployer.go b/pkg/rhos/ocpgwdeployer.go
@@ -73,8 +73,6 @@ type machineSetConfig struct {
 func (d *ocpGatewayDeployer) loadGatewayYAML(uuidGW, image string, useInternalSG bool) ([]byte, error) {
 	var buf bytes.Buffer
 
-	// TODO: Not working properly, but we should revisit this as it makes more sense
-	// tpl, err := template.ParseFiles("pkg/aws/gw-machineset.yaml.template")
 	tpl, err := template.New("").Parse(machineSetYAML)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create machine set template")