diff --git a/charts/manager/templates/deployment-controller.yaml b/charts/manager/templates/deployment-controller.yaml index f28c68778..6e1f7ca96 100644 --- a/charts/manager/templates/deployment-controller.yaml +++ b/charts/manager/templates/deployment-controller.yaml @@ -63,9 +63,6 @@ spec: periodSeconds: 20 name: manager ports: - - containerPort: 9443 - name: webhook-server - protocol: TCP - containerPort: 8080 name: metrics - containerPort: 8081 @@ -77,16 +74,7 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 securityContext: {{- toYaml .Values.controllerManager.containerSecurityContext | nindent 10 }} - volumeMounts: - - mountPath: /tmp/k8s-webhook-server/serving-certs - name: cert - readOnly: true securityContext: runAsNonRoot: true serviceAccountName: {{ include "manager.fullname" . }}-controller-manager terminationGracePeriodSeconds: 10 - volumes: - - name: cert - secret: - defaultMode: 420 - secretName: {{ include "manager.fullname" . }}-webhook-server-cert diff --git a/e2e/plugin/e2e_test.go b/e2e/plugin/e2e_test.go index c80e4dcb2..17aa296c6 100644 --- a/e2e/plugin/e2e_test.go +++ b/e2e/plugin/e2e_test.go @@ -272,6 +272,25 @@ var _ = Describe("Plugin E2E", Ordered, func() { err = adminClient.Update(ctx, testPluginPreset) Expect(err).ToNot(HaveOccurred()) + By("Ensure the plugin preset is updated") + Eventually(func(g Gomega) { + err = adminClient.Get(ctx, client.ObjectKeyFromObject(testPluginPreset), testPluginPreset) + Expect(err).ToNot(HaveOccurred()) + Expect(testPluginPreset.Spec.ClusterOptionOverrides).To(HaveLen(1)) + Expect(testPluginPreset.Spec.ClusterOptionOverrides[0].Overrides).To(HaveLen(1)) + Expect(testPluginPreset.Spec.ClusterOptionOverrides[0].Overrides[0].Name).To(BeEquivalentTo("replicaCount")) + Expect(testPluginPreset.Spec.ClusterOptionOverrides[0].Overrides[0].Value).To(BeEquivalentTo(&apiextensionsv1.JSON{Raw: []byte("3")})) + }).Should(Succeed()) + + By("Checking the plugin status is ready") + Eventually(func(g Gomega) { + pluginList := &greenhousev1alpha1.PluginList{} + err = adminClient.List(ctx, pluginList) + g.Expect(err).NotTo(HaveOccurred()) + g.Expect(len(pluginList.Items)).To(BeEquivalentTo(1)) + g.Expect(pluginList.Items[0].Status.HelmReleaseStatus.Status).To(BeEquivalentTo("deployed")) + }).Should(Succeed()) + By("Check the replicas in deployment") Eventually(func(g Gomega) { deploymentList := &appsv1.DeploymentList{}