Merge branch 'master' into kip_webhook

codeready-toolchain · Nov 14, 2023 · 678bab5 · 678bab5
2 parents 9fdc780 + 6fcc846
commit 678bab5
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 5 deletions.
diff --git a/deploy/member-operator/e2e-tests/README.adoc → deploy/crds/README.adoc b/deploy/member-operator/e2e-tests/README.adoc → deploy/crds/README.adoc
diff --git a/...ts/appstudio.redhat.com_applications.yaml → ...ds/appstudio.redhat.com_applications.yaml b/...ts/appstudio.redhat.com_applications.yaml → ...ds/appstudio.redhat.com_applications.yaml
diff --git a/...ts/appstudio.redhat.com_environments.yaml → ...ds/appstudio.redhat.com_environments.yaml b/...ts/appstudio.redhat.com_environments.yaml → ...ds/appstudio.redhat.com_environments.yaml
diff --git a/...2e-tests/kubevirt.io_virtualmachines.yaml → deploy/crds/kubevirt.io_virtualmachines.yaml b/...2e-tests/kubevirt.io_virtualmachines.yaml → deploy/crds/kubevirt.io_virtualmachines.yaml
diff --git a/deploy/host-operator/dev/toolchainconfig.yaml b/deploy/host-operator/dev/toolchainconfig.yaml
@@ -17,3 +17,7 @@ spec:
       memberStatus:
         refreshPeriod: "1s"
       environment: 'dev'
+      webhook:
+        secret:
+          ref: 'member-operator-secret'
+          virtualMachineAccessKey: 'vm.access'
diff --git a/deploy/host-operator/e2e-tests/toolchainconfig.yaml b/deploy/host-operator/e2e-tests/toolchainconfig.yaml
@@ -39,6 +39,10 @@ spec:
         deploy: true
       memberStatus:
         refreshPeriod: "1s"
+      webhook:
+        secret:
+          ref: 'member-operator-secret'
+          virtualMachineAccessKey: 'vm.access'
       webConsolePlugin:
         deploy: true
       environment: 'e2e-tests'
diff --git a/deploy/member-operator/dev/secrets.yaml b/deploy/member-operator/dev/secrets.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: member-operator-secret
+type: Opaque
+stringData:
+  vm.access: ssh-rsa PcHUNFXhysGvTnvORVbR70EVZA test@host-operator
diff --git a/deploy/member-operator/e2e-tests/secrets.yaml b/deploy/member-operator/e2e-tests/secrets.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: member-operator-secret
+type: Opaque
+stringData:
+  vm.access: ssh-rsa PcHUNFXhysGvTnvORVbR70EVZA test@host-operator
diff --git a/make/test.mk b/make/test.mk
@@ -309,20 +309,22 @@ endif
 ###########################################################
 
 .PHONY: prepare-projects
-prepare-projects: create-host-project create-member1 create-member2 create-appstudio-crds
+prepare-projects: create-host-project create-member1 create-member2 create-thirdparty-crds
 
 .PHONY: create-member1
 create-member1:
 	@echo "Preparing namespace for member operator: $(MEMBER_NS)..."
 	$(MAKE) create-project PROJECT_NAME=${MEMBER_NS}
 	-oc label ns --overwrite=true ${MEMBER_NS} app=member-operator
+	oc apply -f deploy/member-operator/${ENVIRONMENT}/ -n ${MEMBER_NS}
 
 .PHONY: create-member2
 create-member2:
 ifeq ($(SECOND_MEMBER_MODE),true)
 	@echo "Preparing namespace for second member operator: ${MEMBER_NS_2}..."
 	$(MAKE) create-project PROJECT_NAME=${MEMBER_NS_2}
 	-oc label ns --overwrite=true ${MEMBER_NS_2} app=member-operator
+	oc apply -f deploy/member-operator/${ENVIRONMENT}/ -n ${MEMBER_NS_2}
 endif
 
 .PHONY: deploy-host
@@ -356,9 +358,9 @@ ifneq ($(E2E_TEST_EXECUTION),true)
 	oc delete pods --namespace ${HOST_NS} -l name=registration-service || true
 endif
 
-.PHONY: create-appstudio-crds
-create-appstudio-crds:
-	oc apply -f deploy/member-operator/e2e-tests/
+.PHONY: create-thirdparty-crds
+create-thirdparty-crds:
+	oc apply -f deploy/crds/
 
 .PHONY: create-project
 create-project:

diff --git a/test/e2e/parallel/vm_webhook_test.go b/test/e2e/parallel/vm_webhook_test.go
@@ -100,7 +100,7 @@ func TestCreateVirtualMachine(t *testing.T) {
 				userData, userDataFound, userDataErr := unstructured.NestedString(volumes[0].(map[string]interface{}), cloudInitType, "userData")
 				require.NoError(t, userDataErr)
 				require.True(t, userDataFound, "user data not found")
-				require.Equal(t, userData, "#cloud-config\nchpasswd:\n  expire: false\npassword: abcd-1234-ef56\nssh_authorized_keys:\n- |\n  ssh-rsa tmpkey human@machine\nuser: cloud-user\n")
+				require.Equal(t, userData, "#cloud-config\nchpasswd:\n  expire: false\npassword: abcd-1234-ef56\nssh_authorized_keys:\n- |\n  ssh-rsa PcHUNFXhysGvTnvORVbR70EVZA test@host-operator\nuser: cloud-user\n")
 			})
 		}
 	})