fix: Use the latest image of vm-console-proxy

- Updated release script to change vm-console-proxy image tag. - csv-generator uses VM_CONSOLE_PROXY_IMAGE env variable to set the image. Signed-off-by: Andrej Krejcir <[email protected]>
kubevirt · Aug 8, 2023 · 803a13f · 803a13f
1 parent fc1d67c
commit 803a13f
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 2 deletions.
diff --git a/.github/workflows/release-vm-console-proxy.yaml b/.github/workflows/release-vm-console-proxy.yaml
@@ -17,6 +17,7 @@ jobs:
           OUTPUT_FILE=./data/vm-console-proxy-bundle/vm-console-proxy.yaml
           mkdir -p ./data/vm-console-proxy-bundle
           curl -L https://github.com/kubevirt/vm-console-proxy/releases/download/${RELEASE_VERSION}/vm-console-proxy.yaml > ${OUTPUT_FILE}
+          sed -i "s/defaultVmConsoleProxyImageTag = .*$/defaultVmConsoleProxyImageTag = \"${RELEASE_VERSION}\"/" ./internal/operands/vm-console-proxy/defaults.go 
 
       - name: Create pull request
         if: ${{ github.event.client_payload.release_version }} != ''

diff --git a/config/manager/manager.template.yaml b/config/manager/manager.template.yaml
@@ -37,6 +37,7 @@ spec:
           - name: OPERATOR_VERSION
           - name: TEKTON_TASKS_IMAGE
           - name: TEKTON_TASKS_DISK_VIRT_IMAGE
+          - name: VM_CONSOLE_PROXY_IMAGE
         image: controller:latest
         name: manager
         resources:

diff --git a/hack/csv-generator.go b/hack/csv-generator.go
@@ -48,6 +48,7 @@ type generatorFlags struct {
 	tektonTasksImage         string
 	tektonTasksDiskVirtImage string
 	virtioImage              string
+	vmConsoleProxyImage      string
 }
 
 var (
@@ -83,6 +84,7 @@ func init() {
 	rootCmd.Flags().StringVar(&f.tektonTasksImage, "tekton-tasks-image", "", "Link to tekton tasks image")
 	rootCmd.Flags().StringVar(&f.tektonTasksDiskVirtImage, "tekton-tasks-disk-virt-image", "", "Link to tekton tasks disk virt image")
 	rootCmd.Flags().StringVar(&f.virtioImage, "virtio-image", "", "Link to virtio image")
+	rootCmd.Flags().StringVar(&f.vmConsoleProxyImage, "vm-console-proxy-image", "", "Link to VM console proxy image")
 	rootCmd.Flags().Int32Var(&f.webhookPort, "webhook-port", 0, "Container port for the admission webhook")
 	rootCmd.Flags().BoolVar(&f.removeCerts, "webhook-remove-certs", false, "Remove the webhook certificate volume and mount")
 	rootCmd.Flags().BoolVar(&f.dumpCRDs, "dump-crds", false, "Dump crds to stdout")
@@ -216,6 +218,14 @@ func buildRelatedImages(flags generatorFlags) ([]interface{}, error) {
 		relatedImages = append(relatedImages, relatedImage)
 	}
 
+	if flags.vmConsoleProxyImage != "" {
+		relatedImage, err := buildRelatedImage(flags.vmConsoleProxyImage, "vm-console-proxy")
+		if err != nil {
+			return nil, err
+		}
+		relatedImages = append(relatedImages, relatedImage)
+	}
+
 	return relatedImages, nil
 }
 
@@ -271,6 +281,10 @@ func updateContainerEnvVars(flags generatorFlags, container v1.Container) []v1.E
 			if flags.virtioImage != "" {
 				envVariable.Value = flags.virtioImage
 			}
+		case common.VmConsoleProxyImageKey:
+			if flags.vmConsoleProxyImage != "" {
+				envVariable.Value = flags.vmConsoleProxyImage
+			}
 		}
 
 		updatedVariables = append(updatedVariables, envVariable)

diff --git a/hack/csv-generator_test.go b/hack/csv-generator_test.go
@@ -27,6 +27,7 @@ var _ = Describe("csv generator", func() {
 		tektonTasksImage:         "testTektonTasksImage",
 		tektonTasksDiskVirtImage: "testTektonTasksDiskVirtImage",
 		virtioImage:              "testVirtioImage",
+		vmConsoleProxyImage:      "testVmConsoleProxyImage",
 	}
 	envValues := []v1.EnvVar{
 		{Name: common.TemplateValidatorImageKey},
@@ -90,6 +91,9 @@ var _ = Describe("csv generator", func() {
 					if envVariable.Name == common.VirtioImageKey {
 						Expect(envVariable.Value).To(Equal(flags.virtioImage))
 					}
+					if envVariable.Name == common.VmConsoleProxyImageKey {
+						Expect(envVariable.Value).To(Equal(flags.vmConsoleProxyImage))
+					}
 				}
 				break
 			}

diff --git a/internal/common/environment.go b/internal/common/environment.go
@@ -21,6 +21,7 @@ const (
 	TektonTasksImageKey         = "TEKTON_TASKS_IMAGE"
 	TektonTasksDiskVirtImageKey = "TEKTON_TASKS_DISK_VIRT_IMAGE"
 	VirtioImageKey              = "VIRTIO_IMG"
+	VmConsoleProxyImageKey      = "VM_CONSOLE_PROXY_IMAGE"
 
 	DefaultTektonTasksIMG         = "quay.io/kubevirt/tekton-tasks:" + TektonTasksVersion
 	DeafultTektonTasksDiskVirtIMG = "quay.io/kubevirt/tekton-tasks-disk-virt:" + TektonTasksVersion

diff --git a/internal/operands/vm-console-proxy/defaults.go b/internal/operands/vm-console-proxy/defaults.go
@@ -0,0 +1,6 @@
+package vm_console_proxy
+
+const (
+	defaultVmConsoleProxyImageTag = "v0.3.0"
+	defaultVmConsoleProxyImage    = "quay.io/kubevirt/vm-console-proxy:" + defaultVmConsoleProxyImageTag
+)
diff --git a/internal/operands/vm-console-proxy/reconcile.go b/internal/operands/vm-console-proxy/reconcile.go
@@ -261,7 +261,7 @@ func getVmConsoleProxyNamespace(request *common.Request) string {
 }
 
 func getVmConsoleProxyImage() string {
-	return common.EnvOrDefault("VM_CONSOLE_PROXY_IMAGE", "quay.io/kubevirt/vm-console-proxy:v0.1.0")
+	return common.EnvOrDefault(common.VmConsoleProxyImageKey, defaultVmConsoleProxyImage)
 }
 
 func findResourcesUsingLabels[PtrL interface {

diff --git a/tests/e2e-test-csv-generator.sh b/tests/e2e-test-csv-generator.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 olm_output=$(podman run --rm --entrypoint=/csv-generator quay.io/kubevirt/ssp-operator:latest \
---csv-version=9.9.9 --namespace=namespace-test --operator-version=8.8.8  --validator-image=validator-test --dump-crds \
+--csv-version=9.9.9 --namespace=namespace-test --operator-version=8.8.8  --validator-image=validator-test --vm-console-proxy-image=proxy-test --dump-crds \
 --operator-image=operator-test)
 
 if [ $(echo $olm_output | grep 'ClusterServiceVersion' | wc -l) -eq 0 ]; then
@@ -19,6 +19,11 @@ if [ $(echo $olm_output | grep 'value: validator-test'| wc -l) -eq 0 ]; then
     exit 1
 fi
 
+if [ $(echo $olm_output | grep 'value: proxy-test'| wc -l) -eq 0 ]; then
+    echo "output doesn't contain correct proxy-image"
+    exit 1
+fi
+
 if [ $(echo $olm_output | grep 'value: 8.8.8'| wc -l) -eq 0 ]; then
     echo "output doesn't contain correct operator-version"
     exit 1