Prepare for RedHat marketplace release

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Future
+
+### Features
+
+### Bug fixes
+
+### Other changes
+* Added environment variable 'RELATED_IMAGE_DYNATRACE_ONEAGENT' as preparation for RedHat marketplace release ([#228](hhttps://github.com/Dynatrace/dynatrace-oneagent-operator/pull/228))
+
 ## v0.7
 
 ### [v0.7.0](https://github.com/Dynatrace/dynatrace-oneagent-operator/releases/tag/v0.7.0)

README.md

@@ -101,7 +101,7 @@ spec:
     operator: Exists
   # oneagent installer image (optional)
   # certified image from Red Hat Container Catalog for use on OpenShift: registry.connect.redhat.com/dynatrace/oneagent
-  # defaults to docker.io/dynatrace/oneagent
+  # for kubernetes it defaults to docker.io/dynatrace/oneagent
   image: ""
   # arguments to oneagent installer (optional)
   # https://www.dynatrace.com/support/help/shortlink/oneagent-docker#limitations

deploy/cr.yaml

@@ -23,7 +23,7 @@ spec:
     operator: Exists
   # oneagent installer image (optional)
   # certified image from Red Hat Container Catalog for use on OpenShift: registry.connect.redhat.com/dynatrace/oneagent
-  # defaults to docker.io/dynatrace/oneagent
+  # for kubernetes it defaults to docker.io/dynatrace/oneagent
   image: ""
   # arguments to oneagent installer (optional)
   # https://www.dynatrace.com/support/help/shortlink/oneagent-docker#limitations

deploy/crds/dynatrace.com_oneagents_crd.yaml

@@ -168,7 +168,8 @@ spec:
               type: array
             image:
               description: 'Optional: the Dynatrace installer container image Defaults
-                to docker.io/dynatrace/oneagent:latest'
+                to docker.io/dynatrace/oneagent:latest for Kubernetes and to registry.connect.redhat.com/dynatrace/oneagent
+                for OpenShift'
               type: string
             labels:
               additionalProperties:

deploy/openshift.yaml

@@ -527,6 +527,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+            - name: RELATED_IMAGE_DYNATRACE_ONEAGENT
+              value: registry.connect.redhat.com/dynatrace/oneagent
           ports:
             - containerPort: 60000
               name: metrics

deploy/openshift/deployment.yaml

@@ -34,6 +34,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+            - name: RELATED_IMAGE_DYNATRACE_ONEAGENT
+              value: registry.connect.redhat.com/dynatrace/oneagent
           ports:
             - containerPort: 60000
               name: metrics

pkg/apis/dynatrace/v1alpha1/oneagent_types.go

@@ -37,7 +37,7 @@ type OneAgentSpec struct {
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.x-descriptors="urn:alm:descriptor:com.tectonic.ui:advanced,urn:alm:descriptor:com.tectonic.ui:number"
 	WaitReadySeconds *uint16 `json:"waitReadySeconds,omitempty"`
 	// Optional: the Dynatrace installer container image
-	// Defaults to docker.io/dynatrace/oneagent:latest
+	// Defaults to docker.io/dynatrace/oneagent:latest for Kubernetes and to registry.connect.redhat.com/dynatrace/oneagent for OpenShift
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.displayName="Image"
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.x-descriptors="urn:alm:descriptor:com.tectonic.ui:advanced,urn:alm:descriptor:com.tectonic.ui:text"

pkg/controller/oneagent/oneagent_controller.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
 	"reflect"
 	"strconv"
 	"strings"
@@ -391,9 +392,12 @@ func newDaemonSetForCR(instance *dynatracev1alpha1.OneAgent) *appsv1.DaemonSet {
 func newPodSpecForCR(instance *dynatracev1alpha1.OneAgent) corev1.PodSpec {
 	trueVar := true
 
+	envVarImg := os.Getenv("RELATED_IMAGE_DYNATRACE_ONEAGENT")
 	img := "docker.io/dynatrace/oneagent:latest"
 	if instance.Spec.Image != "" {
 		img = instance.Spec.Image
+	} else if envVarImg != "" {
+		img = envVarImg
 	}
 
 	sa := "dynatrace-oneagent"