more naming cleanup

hashicorp · Aug 8, 2023 · c75334c · c75334c
1 parent eeea753
commit c75334c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/charts/consul/templates/gateway-resources-job.yaml b/charts/consul/templates/gateway-resources-job.yaml
@@ -102,7 +102,7 @@ spec:
             {{- if .Values.global.openshift.enabled  }}
             - -openshift-scc-name={{ .Values.connectInject.apiGateway.managedGatewayClass.openshiftSCCName }}
             {{- end }}
-            - -mapPrivilegedContainerPorts={{ .Values.connectInject.apiGateway.managedGatewayClass.mapPrivilegedServicePorts }}
+            - -mapPrivilegedContainerPorts={{ .Values.connectInject.apiGateway.managedGatewayClass.mapPrivilegedContainerPorts }}
             {{- end}}
           resources:
             requests:

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -2210,7 +2210,7 @@ connectInject:
       # This is useful if you don't want to give your containers extra permissions to run privileged ports.
       # Example: The gateway listener is defined on port 80, but the underlying value of the port on the container
       # will be the 80 + the number defined below.
-      mapPrivilegedServicePorts: 0
+      mapPrivilegedContainerPorts: 0
 
     # Configuration for the ServiceAccount created for the api-gateway component
     serviceAccount:

diff --git a/cli/helm/values.go b/cli/helm/values.go
@@ -582,7 +582,7 @@ type ManagedGatewayClass struct {
 	UseHostPorts              bool            `yaml:"useHostPorts"`
 	CopyAnnotations           CopyAnnotations `yaml:"copyAnnotations"`
 	OpenshiftSCCName          string          `yaml:"openshiftSCCName"`
-	mapPrivilegedServicePorts int             `yaml:"mapPrivilegedServicePorts"`
+	mapPrivilegedContainerPorts int             `yaml:"mapPrivilegedContainerPorts"`
 }
 
 type Service struct {

diff --git a/control-plane/api-gateway/common/helm_config.go b/control-plane/api-gateway/common/helm_config.go
@@ -22,14 +22,14 @@ type HelmConfig struct {
 	EnableNamespaceMirroring   bool
 	AuthMethod                 string
 	// LogLevel is the logging level of the deployed Consul Dataplanes.
-	LogLevel            string
-	ConsulPartition     string
-	LogJSON             bool
-	TLSEnabled          bool
-	PeeringEnabled      bool
-	ConsulTLSServerName string
-	ConsulCACert        string
-	ConsulConfig        ConsulConfig
+	LogLevel                    string
+	ConsulPartition             string
+	LogJSON                     bool
+	TLSEnabled                  bool
+	PeeringEnabled              bool
+	ConsulTLSServerName         string
+	ConsulCACert                string
+	ConsulConfig                ConsulConfig
 
 	// EnableOpenShift indicates whether we're deploying into an OpenShift environment
 	// and should create SecurityContextConstraints.