OCM-13976 | ci: adjust some configures to support OCP E2E jobs

Author: yingzhanredhat

tests/ci/config/config.go

@@ -46,6 +46,7 @@ type TestConfig struct {
 	ProxyCABundleFile               string
 	GlobalENV                       *GlobalENVVariables
 	ClusterENV                      *ClusterENVVariables
+	Day2ConfENV                     *Day2ConfENVVariables
 }
 type GlobalENVVariables struct {
 	ChannelGroup          string `env:"CHANNEL_GROUP" default:""`
@@ -73,6 +74,12 @@ type ClusterENVVariables struct {
 	AllowRegistries    string `env:"ALLOW_REGISTRIES" default:""`
 }
 
+type Day2ConfENVVariables struct {
+	LocalZoneMP    bool `env:"LOCAL_ZONE_MP" default:"false"`
+	TuningConfig   bool `env:"TUNING_CONFIG" default:"false"`
+	TuningConfigMP bool `env:"TUNING_CONFIG_MP" default:"false"`
+}
+
 func init() {
 	Test = new(TestConfig)
 	currentDir, _ := os.Getwd()
@@ -146,4 +153,13 @@ func init() {
 		AllowRegistries:    os.Getenv("ALLOW_REGISTRIES"),
 	}
 
+	local_zone_mp, _ := strconv.ParseBool(helper.ReadENVWithDefaultValue("LOCAL_ZONE_MP", "false"))
+	tuning_config, _ := strconv.ParseBool(helper.ReadENVWithDefaultValue("TUNING_CONFIG", "false"))
+	tuning_config_mp, _ := strconv.ParseBool(helper.ReadENVWithDefaultValue("TUNING_CONFIG_MP", "false"))
+	Test.Day2ConfENV = &Day2ConfENVVariables{
+		LocalZoneMP:    local_zone_mp,
+		TuningConfig:   tuning_config,
+		TuningConfigMP: tuning_config_mp,
+	}
+
 }

tests/ci/data/profiles/rosa-classic.yaml

@@ -16,7 +16,7 @@ profiles:
     autoscale: true
     kms_key: true
     networking: true
-    proxy_enabled: true
+    proxy_enabled: false
     label_enabled: true
     tag_enabled: false
     zones: ""
@@ -34,6 +34,10 @@ profiles:
   account-role:
     path: "/test/"
     permission_boundary: "arn:aws:iam::aws:policy/AdministratorAccess"
+  day2-conf:
+    local-zone-mp: false
+    tuning-config: false
+    tuning-config-mp: false
 - as: rosa-private-link
   version: latest
   channel_group: "candidate"
@@ -51,7 +55,7 @@ profiles:
     autoscale: true
     kms_key: true
     networking: false
-    proxy_enabled: false
+    proxy_enabled: true
     label_enabled: false
     tag_enabled: false
     zones: ""

tests/ci/data/profiles/rosa-hcp.yaml

@@ -194,4 +194,38 @@ profiles:
   account-role:
     customized_prefix: true
     path: ""
-    permission_boundary: ""
+    permission_boundary: ""
+- as: rosa-hcp-zero-egress
+  version: latest
+  channel_group: stable
+  region: "us-west-2"
+  cluster:
+    multi_az: true
+    shared_vpc: false
+    instance_type: "m5.xlarge"
+    hcp: true
+    sts: true
+    byo_vpc: true
+    additional_principals: false
+    imdsv2: "required"
+    private: true
+    etcd_encryption: true
+    autoscale: true
+    kms_key: true
+    networking: true
+    proxy_enabled: true
+    label_enabled: false
+    zones: ""
+    tag_enabled: true
+    etcd_kms: true
+    fips: false
+    oidc_config: "managed"
+    admin_enabled: false
+    volume_size: 75
+    disable_uwm: true
+    additional_sg_number: 3
+    zero_egress: false
+  account-role:
+    customized_prefix: true
+    path: ""
+    permission_boundary: ""

tests/ci/labels/runtime.go

@@ -17,6 +17,7 @@ type runtimeLabels struct {
 	Day1          Labels
 	Day1Readiness Labels
 	Day1Post      Labels
+	Day2Readiness Labels
 	Day2          Labels
 	Upgrade       Labels
 	Destructive   Labels
@@ -44,6 +45,7 @@ func initRuntime() *runtimeLabels {
 	rLabels.Destructive = Label("destructive")
 	rLabels.Destroy = Label("destroy")
 	rLabels.DestroyPost = Label("destroy-post")
+	rLabels.Day2Readiness = Label("day2-readiness")
 
 	rLabels.Day1Supplemental = Label("day1-supplemental")
 	rLabels.OCMResources = Label("ocm-resources")

tests/e2e/e2e.test

@@ -7,6 +7,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"github.com/openshift-online/ocm-common/pkg/test/vpc_client"
 
 	"github.com/openshift/rosa/tests/ci/config"
 	"github.com/openshift/rosa/tests/ci/labels"
@@ -141,4 +142,112 @@ var _ = Describe("Cluster preparation", labels.Feature.Cluster, func() {
 			}
 
 		})
+
+	It("to prepare day2 conf for cluster",
+		labels.Runtime.Day2Readiness,
+		func() {
+			profile := handler.LoadProfileYamlFileByENV()
+			client := rosacli.NewClient()
+			clusterHandler, err := handler.NewClusterHandlerFromFilesystem(client, profile)
+			Expect(err).ToNot(HaveOccurred())
+
+			clusterID := clusterHandler.GetClusterDetail().ClusterID
+			clusterService := client.Cluster
+			output, err := clusterService.DescribeCluster(clusterID)
+			Expect(err).To(BeNil())
+			clusterDetails, err := clusterService.ReflectClusterDescription(output)
+			Expect(err).To(BeNil())
+
+			clusterConfig, err := utilConfig.ParseClusterProfile()
+			Expect(err).To(BeNil())
+
+			if profile.ClusterConfig.BYOVPC == false {
+				Skip("This day2 config only work for byovpc cluster")
+			}
+
+			//Create local zone for cluster
+			if profile.Day2Config != nil && profile.Day2Config.LocalZoneMP {
+				By("Prepare a subnet out of the cluster creation subnet")
+				subnets := helper.ParseCommaSeparatedStrings(clusterConfig.Subnets.PrivateSubnetIds)
+
+				By("Build vpc client to find a local zone for subnet preparation")
+				vpcClient, err := vpc_client.GenerateVPCBySubnet(subnets[0], clusterConfig.Region)
+				Expect(err).ToNot(HaveOccurred())
+
+				zones, err := vpcClient.AWSClient.ListAvaliableZonesForRegion(clusterConfig.Region, "local-zone")
+				Expect(err).ToNot(HaveOccurred())
+				Expect(len(zones)).ToNot(BeZero(), "No local zone found in the region")
+				localZone := zones[0]
+
+				By("Prepare the subnet for the picked zone")
+				subNetMap, err := vpcClient.PreparePairSubnetByZone(localZone)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(subNetMap).ToNot(BeNil())
+				privateSubnet := subNetMap["private"]
+
+				By("Describe the cluster to get the infra ID for tagging")
+				tagKey := fmt.Sprintf("kubernetes.io/cluster/%s", clusterDetails.InfraID)
+				vpcClient.AWSClient.TagResource(privateSubnet.ID, map[string]string{
+					tagKey: "shared",
+				})
+
+				By("Find a machinetype supported by the zone")
+				instanceTypes, err := vpcClient.AWSClient.ListAvaliableInstanceTypesForRegion(
+					clusterConfig.Region, localZone)
+				Expect(err).ToNot(HaveOccurred())
+
+				By("Create temporary account-roles for instance type list")
+				namePrefix := helper.GenerateRandomName("test-day2-conf", 2)
+				majorVersion := helper.SplitMajorVersion(clusterConfig.Version.RawID)
+				_, err = client.OCMResource.CreateAccountRole("--mode", "auto",
+					"--prefix", namePrefix,
+					"--version", majorVersion,
+					"--channel-group", clusterConfig.Version.ChannelGroup,
+					"-y")
+				Expect(err).ToNot(HaveOccurred())
+
+				var accountRoles *rosacli.AccountRolesUnit
+				accRoleList, _, err := client.OCMResource.ListAccountRole()
+				Expect(err).ToNot(HaveOccurred())
+				accountRoles = accRoleList.DigAccountRoles(namePrefix, false)
+
+				defer client.OCMResource.DeleteAccountRole(
+					"--prefix", namePrefix,
+					"--mode", "auto",
+					"-y")
+
+				rosaSupported, _, err := client.OCMResource.ListInstanceTypes(
+					"--region", clusterConfig.Region,
+					"--role-arn", accountRoles.InstallerRole,
+				)
+				Expect(err).ToNot(HaveOccurred())
+
+				bothSupported := []string{}
+				for _, rosains := range rosaSupported.InstanceTypesList {
+					if helper.SliceContains(instanceTypes, rosains.ID) {
+						bothSupported = append(bothSupported, rosains.ID)
+					}
+				}
+				Expect(bothSupported).ToNot(BeEmpty(), "There are no instance types supported in the zone")
+				instanceType := bothSupported[0]
+
+				By("Create machinepool with the subnet specified will succeed")
+				localZoneMpName := "localz-day2-conf"
+				_, err = client.MachinePool.CreateMachinePool(clusterID, localZoneMpName,
+					"--replicas", "1",
+					"--subnet", privateSubnet.ID,
+					"--instance-type", instanceType,
+					"--labels", "prowci=true,node-role.kubernetes.io/edge=",
+					"--taints", "prowci=true:NoSchedule,node-role.kubernetes.io/edge=:NoSchedule",
+				)
+				Expect(err).ToNot(HaveOccurred())
+
+				By("List the machinepools and check")
+				mpList, err := client.MachinePool.ListAndReflectMachinePools(clusterID)
+				Expect(err).ToNot(HaveOccurred())
+				mp := mpList.Machinepool(localZoneMpName)
+				Expect(mp.Replicas).To(Equal("1"))
+				Expect(mp.Subnets).To(Equal(privateSubnet.ID))
+			}
+		})
 })

tests/e2e/e2e_setup_test.go

@@ -812,7 +812,7 @@ func (ch *clusterHandler) GenerateClusterCreateFlags() ([]string, error) {
 			"--registry-config-additional-trusted-ca", caFile,
 			"--registry-config-insecure-registries", "test.com,*.example",
 			"--registry-config-allowed-registries-for-import",
-			"docker.io:false,registry.redhat.com:false,registry.access.redhat.com:false,quay.io:false",
+			"docker.io:false,registry.redhat.com:false,registry.access.redhat.com:false,quay.io:false,registry.redhat.io:false",
 		)
 		if ch.profile.ClusterConfig.AllowedRegistries {
 			flags = append(flags,

tests/utils/handler/cluster_handler.go

@@ -9,6 +9,14 @@ type Profile struct {
 	Version           string             `yaml:"version,omitempty"`
 	AccountRoleConfig *AccountRoleConfig `yaml:"account-role,omitempty"`
 	ClusterConfig     *ClusterConfig     `yaml:"cluster,omitempty"`
+	Day2Config        *Day2Config        `yaml:"day2-conf,omitempty"`
+}
+
+// Day2Config will map the configuration of day2-conf from profile settings
+type Day2Config struct {
+	LocalZoneMP    bool `yaml:"local-zone-mp,omitempty"`
+	TuningConfig   bool `yaml:" tuning-config,omitempty"`
+	TuningConfigMP bool `yaml:" tuning-config-mp,omitempty"`
 }
 
 // AccountRoleConfig will map the configuration of account roles from profile settings

tests/utils/handler/interface.go

@@ -84,6 +84,9 @@ func LoadProfileYamlFile(profileName string) *Profile {
 	p := GetProfile(profileName, GetYAMLProfilesDir())
 	log.Logger.Infof("Loaded cluster profile configuration from original profile %s : %v", profileName, *p)
 	log.Logger.Infof("Loaded cluster profile configuration from original cluster %s : %v", profileName, *p.ClusterConfig)
+	if p.Day2Config != nil {
+		log.Logger.Infof("Loaded day2 configuration from original day2 conf %s : %v", profileName, *p.Day2Config)
+	}
 	if p.AccountRoleConfig != nil {
 		log.Logger.Infof("Loaded cluster profile configuration from original account-roles %s : %v",
 			profileName, *p.AccountRoleConfig)
@@ -182,5 +185,12 @@ func LoadProfileYamlFileByENV() *Profile {
 		profile.ClusterConfig.AllowedRegistries = helper.ParseBool(config.Test.ClusterENV.AllowRegistries)
 	}
 
+	if config.Test.Day2ConfENV.LocalZoneMP {
+		if profile.Day2Config != nil {
+			log.Logger.Infof("Got global env settings for LOCAL_ZONE_MP, overwritten the profile setting with value %v",
+				config.Test.Day2ConfENV.LocalZoneMP)
+			profile.Day2Config.LocalZoneMP = config.Test.Day2ConfENV.LocalZoneMP
+		}
+	}
 	return profile
 }