rename TrustedCAsConfigmap to PrivateCAsConfigmap

cmd/kots/cli/admin-console-generate-manifests.go

@@ -73,7 +73,7 @@ func AdminGenerateManifestsCmd() *cobra.Command {
 				IsOpenShift:          isOpenShift,
 				IsGKEAutopilot:       isGKEAutopilot,
 				RegistryConfig:       registryConfig,
-				TrustedCAsConfigmap:  v.GetString("private-ca-configmap"),
+				PrivateCAsConfigmap:  v.GetString("private-ca-configmap"),
 			}
 			adminConsoleFiles, err := upstream.GenerateAdminConsoleFiles(renderDir, options)
 			if err != nil {

cmd/kots/cli/install.go

@@ -308,7 +308,7 @@ func InstallCmd() *cobra.Command {
 				RequestedChannelSlug:   preferredChannelSlug,
 				AdditionalLabels:       additionalLabels,
 				AdditionalAnnotations:  additionalAnnotations,
-				TrustedCAsConfigmap:    v.GetString("private-ca-configmap"),
+				PrivateCAsConfigmap:    v.GetString("private-ca-configmap"),
 
 				RegistryConfig: *registryConfig,
 

pkg/kotsadm/objects/kotsadm_objects.go

@@ -344,14 +344,14 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 		})
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		env = append(env, corev1.EnvVar{
 			Name:  "SSL_CERT_DIR",
 			Value: "/certs",
 		})
 		env = append(env, corev1.EnvVar{
 			Name:  "SSL_CERT_CONFIGMAP",
-			Value: deployOptions.TrustedCAsConfigmap,
+			Value: deployOptions.PrivateCAsConfigmap,
 		})
 	}
 
@@ -393,13 +393,13 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 		},
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		volumes = append(volumes, corev1.Volume{
 			Name: "kotsadm-private-cas",
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: deployOptions.TrustedCAsConfigmap,
+						Name: deployOptions.PrivateCAsConfigmap,
 					},
 				},
 			},
@@ -417,7 +417,7 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 		},
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      "kotsadm-private-cas",
 			MountPath: "/certs",
@@ -882,14 +882,14 @@ func KotsadmStatefulSet(deployOptions types.DeployOptions, size resource.Quantit
 		})
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		env = append(env, corev1.EnvVar{
 			Name:  "SSL_CERT_DIR",
 			Value: "/certs",
 		})
 		env = append(env, corev1.EnvVar{
 			Name:  "SSL_CERT_CONFIGMAP",
-			Value: deployOptions.TrustedCAsConfigmap,
+			Value: deployOptions.PrivateCAsConfigmap,
 		})
 	}
 
@@ -944,13 +944,13 @@ func KotsadmStatefulSet(deployOptions types.DeployOptions, size resource.Quantit
 		},
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		volumes = append(volumes, corev1.Volume{
 			Name: "kotsadm-private-cas",
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: deployOptions.TrustedCAsConfigmap,
+						Name: deployOptions.PrivateCAsConfigmap,
 					},
 				},
 			},
@@ -972,7 +972,7 @@ func KotsadmStatefulSet(deployOptions types.DeployOptions, size resource.Quantit
 		},
 	}
 
-	if deployOptions.TrustedCAsConfigmap != "" {
+	if deployOptions.PrivateCAsConfigmap != "" {
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      "kotsadm-private-cas",
 			MountPath: "/certs",

pkg/kotsadm/types/deployoptions.go

@@ -59,7 +59,7 @@ type DeployOptions struct {
 	RequestedChannelSlug   string
 	AdditionalAnnotations  map[string]string
 	AdditionalLabels       map[string]string
-	TrustedCAsConfigmap    string
+	PrivateCAsConfigmap    string
 
 	IdentityConfig kotsv1beta1.IdentityConfig
 	IngressConfig  kotsv1beta1.IngressConfig

pkg/upstream/admin-console.go

@@ -37,7 +37,7 @@ type UpstreamSettings struct {
 	MigrateToMinioXl       bool
 	CurrentMinioImage      string
 	AdditionalNamespaces   []string
-	TrustedCAsConfigmap    string
+	PrivateCAsConfigmap    string
 
 	RegistryConfig kotsadmtypes.RegistryConfig
 }
@@ -64,7 +64,7 @@ func GenerateAdminConsoleFiles(renderDir string, options types.WriteOptions) ([]
 			IsMinimalRBAC:          options.IsMinimalRBAC,
 			AdditionalNamespaces:   options.AdditionalNamespaces,
 			RegistryConfig:         options.RegistryConfig,
-			TrustedCAsConfigmap:    options.TrustedCAsConfigmap,
+			PrivateCAsConfigmap:    options.PrivateCAsConfigmap,
 		}
 		return generateNewAdminConsoleFiles(settings)
 	}
@@ -86,7 +86,7 @@ func GenerateAdminConsoleFiles(renderDir string, options types.WriteOptions) ([]
 		IsMinimalRBAC:          options.IsMinimalRBAC,
 		AdditionalNamespaces:   options.AdditionalNamespaces,
 		RegistryConfig:         options.RegistryConfig,
-		TrustedCAsConfigmap:    options.TrustedCAsConfigmap,
+		PrivateCAsConfigmap:    options.PrivateCAsConfigmap,
 	}
 	if err := loadUpstreamSettingsFromFiles(settings, renderDir, existingFiles); err != nil {
 		return nil, errors.Wrap(err, "failed to find existing settings")
@@ -194,7 +194,7 @@ func generateNewAdminConsoleFiles(settings *UpstreamSettings) ([]types.UpstreamF
 		IsMinimalRBAC:          settings.IsMinimalRBAC,
 		AdditionalNamespaces:   settings.AdditionalNamespaces,
 		RegistryConfig:         settings.RegistryConfig,
-		TrustedCAsConfigmap:    settings.TrustedCAsConfigmap,
+		PrivateCAsConfigmap:    settings.PrivateCAsConfigmap,
 	}
 
 	if deployOptions.SharedPasswordBcrypt == "" && deployOptions.SharedPassword == "" {

pkg/upstream/types/types.go

@@ -83,7 +83,7 @@ type WriteOptions struct {
 	SharedPassword      string
 	IsOpenShift         bool
 	IsGKEAutopilot      bool
-	TrustedCAsConfigmap string
+	PrivateCAsConfigmap string
 
 	RegistryConfig kotsadmtypes.RegistryConfig
 }