remove image defaults from preset mesh config and CRD and allow the

ability to specify the images through environment variables

Signed-off-by: Thomas Stringer <[email protected]>

Author: trstringer

charts/osm/templates/osm-injector-deployment.yaml

@@ -94,6 +94,12 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.name
+            - name: OSM_ENVOY_IMAGE
+              value: "{{ .Values.osm.sidecarImage }}"
+            - name: OSM_ENVOY_WINDOWS_IMAGE
+              value: "{{ .Values.osm.sidecarWindowsImage }}"
+            - name: OSM_INIT_CONTAINER_IMAGE
+              value: '{{ include "osmSidecarInit.image" . }}'
     {{- if .Values.osm.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.osm.imagePullSecrets | indent 8 }}

charts/osm/templates/preset-mesh-config.yaml

@@ -10,9 +10,6 @@ data:
         "enablePrivilegedInitContainer": {{.Values.osm.enablePrivilegedInitContainer | mustToJson}},
         "logLevel": {{.Values.osm.envoyLogLevel | mustToJson}},
         "maxDataPlaneConnections": {{.Values.osm.maxDataPlaneConnections | mustToJson}},
-        "envoyImage": {{.Values.osm.sidecarImage | mustToJson}},
-        "envoyWindowsImage": {{.Values.osm.sidecarWindowsImage | mustToJson}},
-        "initContainerImage": "{{ include "osmSidecarInit.image" . }}",
         "configResyncInterval": {{.Values.osm.configResyncInterval | mustToJson}}
       },
       "traffic": {

cmd/osm-bootstrap/crds/config_meshconfig.yaml

@@ -66,11 +66,9 @@ spec:
                     envoyImage:
                       description: Image for the Envoy sidecar
                       type: string
-                      default: "envoyproxy/envoy-alpine@sha256:6502a637c6c5fba4d03d0672d878d12da4bcc7a0d0fb3f1d506982dde0039abd"
                     envoyWindowsImage:
                       description: Image for the Envoy sidecar on Windows workers
                       type: string
-                      default: "envoyproxy/envoy-windows@sha256:c904fda95891ebbccb9b1f24c1a9482c8d01cbca215dd081fc8c8db36db85f85"
                     initContainerImage:
                       description: Image for the init container
                       type: string

pkg/configurator/methods.go

@@ -3,6 +3,7 @@ package configurator
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -124,17 +125,29 @@ func (c *client) GetEnvoyLogLevel() string {
 
 // GetEnvoyImage returns the envoy image
 func (c *client) GetEnvoyImage() string {
-	return c.getMeshConfig().Spec.Sidecar.EnvoyImage
+	image := c.getMeshConfig().Spec.Sidecar.EnvoyImage
+	if image == "" {
+		image = os.Getenv("OSM_ENVOY_IMAGE")
+	}
+	return image
 }
 
 // GetEnvoyWindowsImage returns the envoy windows image
 func (c *client) GetEnvoyWindowsImage() string {
-	return c.getMeshConfig().Spec.Sidecar.EnvoyWindowsImage
+	image := c.getMeshConfig().Spec.Sidecar.EnvoyWindowsImage
+	if image == "" {
+		image = os.Getenv("OSM_ENVOY_WINDOWS_IMAGE")
+	}
+	return image
 }
 
 // GetInitContainerImage returns the init container image
 func (c *client) GetInitContainerImage() string {
-	return c.getMeshConfig().Spec.Sidecar.InitContainerImage
+	image := c.getMeshConfig().Spec.Sidecar.InitContainerImage
+	if image == "" {
+		image = os.Getenv("OSM_INIT_CONTAINER_IMAGE")
+	}
+	return image
 }
 
 // GetServiceCertValidityPeriod returns the validity duration for service certificates, and a default in case of invalid duration