Merge pull request #9931 from abhay-nutanix/OCPBUGS-61353

OCPBUGS-61353: Generated Redacted nutanix config for operator

Author: openshift-merge-bot[bot]

pkg/asset/manifests/operators.go

@@ -22,6 +22,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/templates/content/manifests"
 	"github.com/openshift/installer/pkg/asset/tls"
 	"github.com/openshift/installer/pkg/types"
+	"github.com/openshift/installer/pkg/types/nutanix"
 	"github.com/openshift/installer/pkg/types/vsphere"
 	"github.com/openshift/library-go/pkg/crypto"
 )
@@ -280,7 +281,8 @@ func redactedInstallConfig(config types.InstallConfig) ([]byte, error) {
 	newConfig := config
 
 	newConfig.PullSecret = ""
-	if newConfig.Platform.VSphere != nil {
+	switch {
+	case newConfig.Platform.VSphere != nil:
 		p := config.VSphere
 		newVCenters := make([]vsphere.VCenter, len(p.VCenters))
 		for i, v := range p.VCenters {
@@ -308,6 +310,30 @@ func redactedInstallConfig(config types.InstallConfig) ([]byte, error) {
 			FailureDomains:             p.FailureDomains,
 		}
 		newConfig.Platform.VSphere = &newVSpherePlatform
+
+	case newConfig.Platform.Nutanix != nil:
+		p := config.Nutanix
+		newPrismCentral := nutanix.PrismCentral{
+			Endpoint: p.PrismCentral.Endpoint,
+			Username: "",
+			Password: "",
+		}
+		newNutanixPlatform := nutanix.Platform{
+			PrismCentral:           newPrismCentral,
+			PrismElements:          p.PrismElements,
+			ClusterOSImage:         p.ClusterOSImage,
+			PreloadedOSImageName:   p.PreloadedOSImageName,
+			DeprecatedAPIVIP:       p.DeprecatedAPIVIP,
+			APIVIPs:                p.APIVIPs,
+			DeprecatedIngressVIP:   p.DeprecatedIngressVIP,
+			IngressVIPs:            p.IngressVIPs,
+			DefaultMachinePlatform: p.DefaultMachinePlatform,
+			SubnetUUIDs:            p.SubnetUUIDs,
+			LoadBalancer:           p.LoadBalancer,
+			FailureDomains:         p.FailureDomains,
+			PrismAPICallTimeout:    p.PrismAPICallTimeout,
+		}
+		newConfig.Platform.Nutanix = &newNutanixPlatform
 	}
 
 	return yaml.Marshal(newConfig)

pkg/asset/manifests/operators_test.go

@@ -5,10 +5,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types"
+	nutanixtypes "github.com/openshift/installer/pkg/types/nutanix"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -36,13 +37,13 @@ func TestRedactedInstallConfig(t *testing.T) {
 			},
 			ControlPlane: &types.MachinePool{
 				Name:         "control-plane",
-				Replicas:     pointer.Int64Ptr(3),
+				Replicas:     ptr.To(int64(3)),
 				Architecture: types.ArchitectureAMD64,
 			},
 			Compute: []types.MachinePool{
 				{
 					Name:         "compute",
-					Replicas:     pointer.Int64Ptr(3),
+					Replicas:     ptr.To(int64(3)),
 					Architecture: types.ArchitectureAMD64,
 				},
 			},
@@ -131,3 +132,114 @@ sshKey: test-ssh-key
 	}
 	assert.Equal(t, expectedConfig, ic, "install config was unexpectedly modified")
 }
+
+// TestRedactedInstallConfigNutanix tests the redactedInstallConfig function for Nutanix platform.
+func TestRedactedInstallConfigNutanix(t *testing.T) {
+	createInstallConfigWithNutanix := func() *types.InstallConfig {
+		return &types.InstallConfig{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "test-nutanix-cluster",
+			},
+			SSHKey:     "test-ssh-key",
+			BaseDomain: "test-domain",
+			Networking: &types.Networking{
+				MachineNetwork: []types.MachineNetworkEntry{
+					{CIDR: *ipnet.MustParseCIDR("1.2.3.4/5")},
+				},
+				NetworkType: "test-network-type",
+				ClusterNetwork: []types.ClusterNetworkEntry{
+					{
+						CIDR:       *ipnet.MustParseCIDR("1.2.3.4/5"),
+						HostPrefix: 6,
+					},
+				},
+				ServiceNetwork: []ipnet.IPNet{*ipnet.MustParseCIDR("1.2.3.4/5")},
+			},
+			ControlPlane: &types.MachinePool{
+				Name:         "control-plane",
+				Replicas:     ptr.To(int64(3)),
+				Architecture: types.ArchitectureAMD64,
+			},
+			Compute: []types.MachinePool{
+				{
+					Name:         "compute",
+					Replicas:     ptr.To(int64(3)),
+					Architecture: types.ArchitectureAMD64,
+				},
+			},
+			Platform: types.Platform{
+				Nutanix: &nutanixtypes.Platform{
+					PrismCentral: nutanixtypes.PrismCentral{
+						Endpoint: nutanixtypes.PrismEndpoint{
+							Address: "test-prism-central.test.com",
+							Port:    9440,
+						},
+						Username: "test-username",
+						Password: "test-password",
+					},
+					PrismElements: []nutanixtypes.PrismElement{{
+						UUID: "test-uuid",
+						Endpoint: nutanixtypes.PrismEndpoint{
+							Address: "test-prism-element.test.com",
+							Port:    9440,
+						},
+						Name: "test-element",
+					}},
+					SubnetUUIDs: []string{"test-subnet-uuid"},
+				},
+			},
+			PullSecret: "test-pull-secret",
+		}
+	}
+
+	expectedYaml := `baseDomain: test-domain
+compute:
+- architecture: amd64
+  name: compute
+  platform: {}
+  replicas: 3
+controlPlane:
+  architecture: amd64
+  name: control-plane
+  platform: {}
+  replicas: 3
+metadata:
+  creationTimestamp: null
+  name: test-nutanix-cluster
+networking:
+  clusterNetwork:
+  - cidr: 1.2.3.4/5
+    hostPrefix: 6
+  machineNetwork:
+  - cidr: 1.2.3.4/5
+  networkType: test-network-type
+  serviceNetwork:
+  - 1.2.3.4/5
+platform:
+  nutanix:
+    prismCentral:
+      endpoint:
+        address: test-prism-central.test.com
+        port: 9440
+      password: ""
+      username: ""
+    prismElements:
+    - endpoint:
+        address: test-prism-element.test.com
+        port: 9440
+      name: test-element
+      uuid: test-uuid
+    subnetUUIDs:
+    - test-subnet-uuid
+pullSecret: ""
+sshKey: test-ssh-key
+`
+
+	expectedConfig := createInstallConfigWithNutanix()
+	ic := createInstallConfigWithNutanix()
+	actualYaml, err := redactedInstallConfig(*ic)
+	if assert.NoError(t, err, "unexpected error") {
+		assert.Equal(t, expectedYaml, string(actualYaml), "unexpected yaml")
+	}
+	assert.Equal(t, expectedConfig, ic, "install config was unexpectedly modified")
+}