Add functional tests for ICSP integration

This change registers the two OpenShift CRs required to test
integration with OpenShifts ImageContentSourcePolicy and the
MachineConfig type required to retrieve the registries.conf file.

It adds two basic tests to ensure the Ansible variables have been added
to the inventory secret when a ImageContentSourcePolicy CR is detected.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>

Author: Brendan Shephard

apis/go.mod

@@ -35,14 +35,11 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/tools v0.24.0 // indirect
+	k8s.io/api v0.29.9
 	k8s.io/apimachinery v0.29.9
 	k8s.io/client-go v0.29.9
-	sigs.k8s.io/controller-runtime v0.17.6
-)
-
-require (
-	k8s.io/api v0.29.9
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	sigs.k8s.io/controller-runtime v0.17.6
 )
 
 require (

tests/functional/dataplane/base_test.go

@@ -30,6 +30,48 @@ var DefaultEdpmServiceAnsibleVarList = []string{
 var CustomEdpmServiceDomainTag = "test-image:latest"
 var DefaultBackoffLimit = int32(6)
 
+func CreateICSP(name types.NamespacedName, spec map[string]interface{}) client.Object {
+	raw := map[string]interface{}{
+		"apiVersion": "operator.openshift.io/v1alpha1",
+		"kind":       "ImageContentSourcePolicy",
+		"metadata": map[string]interface{}{
+			"name":      name.Name,
+			"namespace": name.Namespace,
+		},
+		"spec": spec,
+	}
+	return th.CreateUnstructured(raw)
+}
+
+func CreateMachineConfig() client.Object {
+	raw := map[string]interface{}{
+		"apiVersion": "machineconfiguration.openshift.io/v1",
+		"kind":       "MachineConfig",
+		"metadata": map[string]interface{}{
+			"name": "99-master-generated-registries",
+		},
+		"spec": map[string]interface{}{
+			"config": map[string]interface{}{
+				"storage": map[string]interface{}{
+					"files": []interface{}{
+						map[string]interface{}{
+							"contents": map[string]interface{}{
+								"source":      "data:text/plain;charset=utf-8;base64,dW5xdWFsaWZpZWQtc2VhcmNoLXJlZ2lzdHJpZXMgPSBbInJlZ2lzdHJ5LmFjY2Vzcy5yZWRoYXQuY29tIiwgImRvY2tlci5pbyJdCnNob3J0LW5hbWUtbW9kZSA9ICIiCgpbW3JlZ2lzdHJ5XV0KICBwcmVmaXggPSAiIgogIGxvY2F0aW9uID0gInJlZ2lzdHJ5LmNpLm9wZW5zaGlmdC5vcmcvb3JpZ2luLzQuMTMtMjAyMy0wMi0yNi0xNjMwMzAiCgogIFtbcmVnaXN0cnkubWlycm9yXV0KICAgIGxvY2F0aW9uID0gInJlZ2lzdHJ5Lm9rZC5ibmUtc2hpZnQubmV0Ojg0NDMvb2tkIgogICAgcHVsbC1mcm9tLW1pcnJvciA9ICJkaWdlc3Qtb25seSIKCltbcmVnaXN0cnldXQogIHByZWZpeCA9ICIiCiAgbG9jYXRpb24gPSAicmVnaXN0cnkuY2kub3BlbnNoaWZ0Lm9yZy9vcmlnaW4vNC4xMy0yMDIzLTAzLTA3LTA5NDQwNiIKCiAgW1tyZWdpc3RyeS5taXJyb3JdXQogICAgbG9jYXRpb24gPSAicmVnaXN0cnkub2tkLmJuZS1zaGlmdC5uZXQ6ODQ0My9va2QiCiAgICBwdWxsLWZyb20tbWlycm9yID0gImRpZ2VzdC1vbmx5IgoKW1tyZWdpc3RyeV1dCiAgcHJlZml4ID0gIiIKICBsb2NhdGlvbiA9ICJyZWdpc3RyeS5jaS5vcGVuc2hpZnQub3JnL29yaWdpbi9yZWxlYXNlIgoKICBbW3JlZ2lzdHJ5Lm1pcnJvcl1dCiAgICBsb2NhdGlvbiA9ICJyZWdpc3RyeS5va2QuYm5lLXNoaWZ0Lm5ldDo4NDQzL29rZCIKICAgIHB1bGwtZnJvbS1taXJyb3IgPSAiZGlnZXN0LW9ubHkiCg==",
+								"compression": "",
+							},
+						},
+					},
+				},
+			},
+			"overwrite": true,
+			"mode":      420,
+			"path":      "/etc/containers/registries.conf",
+		},
+	}
+
+	return th.CreateUnstructured(raw)
+}
+
 // Create OpenstackDataPlaneNodeSet in k8s and test that no errors occur
 func CreateDataplaneNodeSet(name types.NamespacedName, spec map[string]interface{}) *unstructured.Unstructured {
 	instance := DefaultDataplaneNodeSetTemplate(name, spec)
@@ -128,7 +170,6 @@ func CreateOpenStackVersion(name types.NamespacedName) *unstructured.Unstructure
 }
 
 // Struct initialization
-
 func DefaultOpenStackVersion(name types.NamespacedName) map[string]interface{} {
 	return map[string]interface{}{
 		"apiVersion": "core.openstack.org/v1beta1",
@@ -146,6 +187,19 @@ func DefaultOpenStackVersion(name types.NamespacedName) map[string]interface{} {
 	}
 }
 
+func DefaultICSPSpec() map[string]interface{} {
+	return map[string]interface{}{
+		"repositoryDigestMirrors": []interface{}{
+			map[string]interface{}{
+				"mirrors": []interface{}{
+					"registry.okd.bne-shift.net:8443/okd", // Change to a string
+				},
+				"source": "registry.ci.openshift.org/origin/release", // Move "source" here
+			},
+		},
+	}
+}
+
 // Build OpenStackDataPlaneNodeSetSpec struct and fill it with preset values
 func DefaultDataPlaneNodeSetSpec(nodeSetName string) map[string]interface{} {
 

tests/functional/dataplane/openstackdataplanenodeset_controller_test.go

@@ -1369,4 +1369,29 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 			}, th.Timeout, th.Interval).Should(Succeed())
 		})
 	})
+
+	When("A ImageContentSourcePolicy exists in the cluster", func() {
+		BeforeEach(func() {
+			nodeSetSpec := DefaultDataPlaneNodeSetSpec("edpm-compute")
+			nodeSetSpec["preProvisioned"] = true
+			DeferCleanup(th.DeleteInstance, CreateNetConfig(dataplaneNetConfigName, DefaultNetConfigSpec()))
+			DeferCleanup(th.DeleteInstance, CreateDNSMasq(dnsMasqName, DefaultDNSMasqSpec()))
+			DeferCleanup(th.DeleteInstance, CreateDataplaneNodeSet(dataplaneNodeSetName, nodeSetSpec))
+			DeferCleanup(th.DeleteInstance, CreateDataplaneDeployment(dataplaneDeploymentName, DefaultDataPlaneDeploymentSpec()))
+			CreateSSHSecret(dataplaneSSHSecretName)
+			CreateICSP(dataplaneNodeSetName, DefaultICSPSpec())
+			CreateMachineConfig()
+			SimulateDNSMasqComplete(dnsMasqName)
+			SimulateIPSetComplete(dataplaneNodeName)
+			SimulateDNSDataComplete(dataplaneNodeSetName)
+
+		})
+		It("Should set edpm_podman_disconnected_ocp variable", func() {
+			secret := th.GetSecret(dataplaneSecretName)
+			Expect(secret.Data["inventory"]).Should(
+				ContainSubstring("edpm_podman_disconnected_ocp"))
+			Expect(secret.Data["inventory"]).Should(
+				ContainSubstring("edpm_podman_registries_conf"))
+		})
+	})
 })

tests/functional/dataplane/suite_test.go

@@ -49,6 +49,9 @@ import (
 
 	certmgrv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 
+	machineconfig "github.com/openshift/api/machineconfiguration/v1"
+	ocp_image "github.com/openshift/api/operator/v1alpha1"
+
 	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 	test "github.com/openstack-k8s-operators/lib-common/modules/test"
@@ -101,6 +104,10 @@ var _ = BeforeSuite(func() {
 	openstackCRDs, err := test.GetCRDDirFromModule(
 		"github.com/openstack-k8s-operators/openstack-operator/apis", gomod, "bases")
 	Expect(err).ShouldNot(HaveOccurred())
+	imageContentSourcePolicyCRDs, err := test.GetCRDDirFromModule("github.com/openshift/api", gomod, "operator/v1alpha1/zz_generated.crd-manifests/")
+	Expect(err).ShouldNot(HaveOccurred())
+	machineConfigCRDs, err := test.GetCRDDirFromModule("github.com/openshift/api", gomod, "machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigs.crd.yaml")
+	Expect(err).ShouldNot(HaveOccurred())
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
@@ -110,6 +117,8 @@ var _ = BeforeSuite(func() {
 			infraCRDs,
 			certmgrv1CRDs,
 			openstackCRDs,
+			imageContentSourcePolicyCRDs,
+			machineConfigCRDs,
 		},
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
 			Paths: []string{filepath.Join("..", "..", "..", "config", "webhook")},
@@ -145,6 +154,11 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	err = certmgrv1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
+	err = machineconfig.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
+	err = ocp_image.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
+
 	// +kubebuilder:scaffold:scheme
 
 	logger = ctrl.Log.WithName("---DataPlane Test---")