Use sidecar images from Openshift conditionally (#803)

Signed-off-by: Bala.FA <bala@minio.io>
minio · Jun 20, 2023 · a0ea3b5 · a0ea3b5
1 parent 514fc98
commit a0ea3b5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/cmd/kubectl-directpv/install.go b/cmd/kubectl-directpv/install.go
@@ -54,6 +54,7 @@ var (
 	kubeVersion      *version.Version
 	legacyFlag       bool
 	declarativeFlag  bool
+	openshiftFlag    bool
 )
 
 var installCmd = &cobra.Command{
@@ -126,6 +127,7 @@ func init() {
 	installCmd.PersistentFlags().BoolVar(&legacyFlag, "legacy", legacyFlag, "Enable legacy mode (Used with '-o')")
 	installCmd.PersistentFlags().BoolVar(&declarativeFlag, "declarative", declarativeFlag, "Output YAML for declarative installation")
 	installCmd.PersistentFlags().MarkHidden("declarative")
+	installCmd.PersistentFlags().BoolVar(&openshiftFlag, "openshift", openshiftFlag, "Use OpenShift specific installation")
 }
 
 func validateNodeSelectorArgs() error {
@@ -309,6 +311,7 @@ func installMain(ctx context.Context) {
 		}
 	}
 	args.Declarative = declarativeFlag
+	args.Openshift = openshiftFlag
 
 	var failed bool
 	var installedComponents []installer.Component

diff --git a/pkg/installer/args.go b/pkg/installer/args.go
@@ -30,19 +30,23 @@ import (
 
 const (
 	// csiProvisionerImage = csi-provisioner:v3.4.0
-	csiProvisionerImage = "csi-provisioner@sha256:704fe68a6344774d4d0fde980af64fac2f2ddd27fb2e7f7c5b3d8fbddeae4ec8"
+	csiProvisionerImage          = "csi-provisioner@sha256:704fe68a6344774d4d0fde980af64fac2f2ddd27fb2e7f7c5b3d8fbddeae4ec8"
+	openshiftCSIProvisionerImage = "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504"
 
 	// csiProvisionerImageV2_2_0 = "csi-provisioner:v2.2.0-go1.18"
 	csiProvisionerImageV2_2_0 = "csi-provisioner@sha256:c185db49ba02c384633165894147f8d7041b34b173e82a49d7145e50e809b8d6"
 
 	// nodeDriverRegistrarImage = csi-node-driver-registrar:v2.6.3
-	nodeDriverRegistrarImage = "csi-node-driver-registrar@sha256:68ee8f0b10acb4189e506d8a0e40c995362d886a35d5cbb17624e59913af0145"
+	nodeDriverRegistrarImage          = "csi-node-driver-registrar@sha256:68ee8f0b10acb4189e506d8a0e40c995362d886a35d5cbb17624e59913af0145"
+	openshiftNodeDriverRegistrarImage = "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:0db5ea72a708503516f33f221848f0adaee71901769699ef5322a79e2da4f6d1"
 
 	// livenessProbeImage = livenessprobe:v2.9.0
-	livenessProbeImage = "livenessprobe@sha256:0522eff1d8e9269655080500c1f6388fe2573978e8a74e08beaf3452cd575c2e"
+	livenessProbeImage          = "livenessprobe@sha256:0522eff1d8e9269655080500c1f6388fe2573978e8a74e08beaf3452cd575c2e"
+	openshiftLivenessProbeImage = "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:81f9f06a7de9a79013a4690ad616c1aff9638ab64284626491f44645a07051ec"
 
 	// csiResizerImage = csi-resizer:v1.7.0
-	csiResizerImage = "csi-resizer@sha256:a88ca4a9bfbd2e604aedae5a04a5c180540259e3ab75393755ff73d587a619b2"
+	csiResizerImage          = "csi-resizer@sha256:a88ca4a9bfbd2e604aedae5a04a5c180540259e3ab75393755ff73d587a619b2"
+	openshiftCSIResizerImage = "registry.redhat.io/openshift4/ose-csi-external-resizer-rhel8@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87"
 )
 
 // Args represents DirectPV installation arguments.
@@ -63,6 +67,7 @@ type Args struct {
 	ObjectWriter     io.Writer
 	DryRun           bool
 	Declarative      bool
+	Openshift        bool
 	ObjectMarshaler  func(runtime.Object) ([]byte, error)
 	ProgressCh       chan<- Message
 	ForceUninstall   bool
@@ -136,17 +141,29 @@ func (args *Args) getContainerImage() string {
 }
 
 func (args *Args) getNodeDriverRegistrarImage() string {
+	if args.Openshift {
+		return openshiftNodeDriverRegistrarImage
+	}
 	return path.Join(args.Registry, args.Org, args.nodeDriverRegistrarImage)
 }
 
 func (args *Args) getLivenessProbeImage() string {
+	if args.Openshift {
+		return openshiftLivenessProbeImage
+	}
 	return path.Join(args.Registry, args.Org, args.livenessProbeImage)
 }
 
 func (args *Args) getCSIProvisionerImage() string {
+	if args.Openshift {
+		return openshiftCSIProvisionerImage
+	}
 	return path.Join(args.Registry, args.Org, args.csiProvisionerImage)
 }
 
 func (args *Args) getCSIResizerImage() string {
+	if args.Openshift {
+		return openshiftCSIResizerImage
+	}
 	return path.Join(args.Registry, args.Org, args.csiResizerImage)
 }