Remove duplicate OpenShift enabled field on Helm config

hashicorp · Aug 7, 2023 · b176b78 · b176b78
1 parent 3d5e980
commit b176b78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/control-plane/api-gateway/common/helm_config.go b/control-plane/api-gateway/common/helm_config.go
@@ -19,7 +19,6 @@ type HelmConfig struct {
 	ConsulDestinationNamespace string
 	NamespaceMirroringPrefix   string
 	EnableNamespaces           bool
-	EnableOpenShift            bool
 	EnableNamespaceMirroring   bool
 	AuthMethod                 string
 	// LogLevel is the logging level of the deployed Consul Dataplanes.
@@ -32,9 +31,9 @@ type HelmConfig struct {
 	ConsulCACert        string
 	ConsulConfig        ConsulConfig
 
-	// OpenShiftEnabled indicates whether we're deploying into an OpenShift environment
+	// EnableOpenShift indicates whether we're deploying into an OpenShift environment
 	// and should create SecurityContextConstraints.
-	OpenShiftEnabled bool
+	EnableOpenShift bool
 
 	// ReleaseName indicates the name of the release for the Helm installation. This value is used
 	// as a prefix for some resources - SecurityContextConstraints, for example - so it must be known.

diff --git a/control-plane/api-gateway/gatekeeper/role.go b/control-plane/api-gateway/gatekeeper/role.go
@@ -81,7 +81,7 @@ func (g *Gatekeeper) role(gateway gwv1beta1.Gateway, gcc v1alpha1.GatewayClassCo
 		})
 	}
 
-	if config.OpenShiftEnabled {
+	if config.EnableOpenShift {
 		role.Rules = append(role.Rules, rbac.PolicyRule{
 			APIGroups: []string{"security.openshift.io"},
 			Resources: []string{"securitycontextconstraints"},

diff --git a/control-plane/subcommand/inject-connect/command.go b/control-plane/subcommand/inject-connect/command.go
@@ -531,7 +531,6 @@ func (c *Command) Run(args []string) int {
 			ConsulTLSServerName:        c.consul.TLSServerName,
 			ConsulPartition:            c.consul.Partition,
 			ConsulCACert:               string(caCertPem),
-			OpenShiftEnabled:           c.flagEnableOpenShift,
 			ReleaseName:                c.flagReleaseName,
 		},
 		AllowK8sNamespacesSet:   allowK8sNamespaces,