hypershift: Add desired-version annotation to controller Deployments

New annotation `release.openshift.io/desired-version` will be used by CSI driver operators to compare the version from env var `OPERATOR_IMAGE_VERSION` with actual version of currently running operand.

Author: mpatlasov

assets/common/hypershift/controller_add_hypershift_desired_version_annotation.yaml

@@ -0,0 +1,3 @@
+metadata:
+  annotations:
+    release.openshift.io/desired-version: ${RELEASE_VERSION}

assets/overlays/aws-ebs/generated/hypershift/controller.yaml

@@ -24,6 +24,7 @@
 # Applied strategic merge patch pod_network_livenessprobe.yaml
 # Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
 # Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
+# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
 # Applied strategic merge patch overlays/aws-ebs/patches/controller_add_hypershift_controller_minter.yaml
 #
 #
@@ -34,6 +35,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: csi-driver
     config.openshift.io/inject-proxy-cabundle: csi-driver
+    release.openshift.io/desired-version: ${RELEASE_VERSION}
   name: aws-ebs-csi-driver-controller
   namespace: ${NAMESPACE}
 spec:

assets/overlays/azure-disk/generated/hypershift/controller.yaml

@@ -24,6 +24,7 @@
 # Applied strategic merge patch pod_network_livenessprobe.yaml
 # Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
 # Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
+# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
 # Applied strategic merge patch overlays/azure-disk/patches/controller_add_hypershift_controller.yaml
 #
 #
@@ -34,6 +35,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: csi-driver
     config.openshift.io/inject-proxy-cabundle: csi-driver
+    release.openshift.io/desired-version: ${RELEASE_VERSION}
   name: azure-disk-csi-driver-controller
   namespace: ${NAMESPACE}
 spec:

assets/overlays/azure-file/generated/hypershift/controller.yaml

@@ -24,6 +24,7 @@
 # Applied strategic merge patch pod_network_livenessprobe.yaml
 # Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
 # Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
+# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
 # Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
 # Applied strategic merge patch overlays/azure-file/patches/controller_add_hypershift_controller.yaml
 #
@@ -35,6 +36,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: csi-driver
     config.openshift.io/inject-proxy-cabundle: csi-driver
+    release.openshift.io/desired-version: ${RELEASE_VERSION}
   name: azure-file-csi-driver-controller
   namespace: ${NAMESPACE}
 spec:

assets/overlays/openstack-cinder/generated/hypershift/controller.yaml

@@ -22,6 +22,7 @@
 # Applied strategic merge patch pod_network_livenessprobe.yaml
 # Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
 # Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
+# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
 # Applied strategic merge patch overlays/openstack-cinder/patches/controller_add_hypershift_volumes.yaml
 #
 #
@@ -32,6 +33,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: csi-driver
     config.openshift.io/inject-proxy-cabundle: csi-driver
+    release.openshift.io/desired-version: ${RELEASE_VERSION}
   name: openstack-cinder-csi-driver-controller
   namespace: ${NAMESPACE}
 spec:

assets/overlays/openstack-manila/generated/hypershift/controller.yaml

@@ -18,6 +18,7 @@
 # Applied strategic merge patch pod_network_livenessprobe.yaml
 # Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
 # Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
+# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
 # Applied strategic merge patch overlays/openstack-manila/patches/controller_add_hypershift_volumes.yaml
 # Applied strategic merge patch overlays/openstack-manila/patches/controller_rename_config_map.yaml
 # Applied strategic merge patch overlays/openstack-manila/patches/modify_anti_affinity_selector.yaml
@@ -30,6 +31,7 @@ metadata:
   annotations:
     config.openshift.io/inject-proxy: csi-driver
     config.openshift.io/inject-proxy-cabundle: csi-driver
+    release.openshift.io/desired-version: ${RELEASE_VERSION}
   name: openstack-manila-csi-controllerplugin
   namespace: ${NAMESPACE}
 spec:

pkg/driver/common/generator/base_assets.go

@@ -45,6 +45,7 @@ var (
 		"controller_sa.yaml", "common/hypershift/controller_sa_pull_secret.yaml",
 		"controller.yaml", "common/hypershift/controller_add_affinity_tolerations.yaml",
 		"controller.yaml", "common/hypershift/controller_add_kubeconfig_volume.yaml.patch",
+		"controller.yaml", "common/hypershift/controller_add_hypershift_desired_version_annotation.yaml",
 	)
 )
 

pkg/driver/common/operator/replacer.go

@@ -2,6 +2,8 @@ package operator
 
 import (
 	"os"
+
+	"github.com/openshift/library-go/pkg/operator/status"
 )
 
 const (
@@ -67,5 +69,6 @@ func DefaultReplacements(controlPlaneNamespace, guestNamespace string) []string
 
 	pairs = append(pairs, []string{"${NAMESPACE}", controlPlaneNamespace}...)
 	pairs = append(pairs, []string{"${NODE_NAMESPACE}", guestNamespace}...)
+	pairs = append(pairs, []string{"${RELEASE_VERSION}", status.VersionForOperatorFromEnv()}...)
 	return pairs
 }