[TT-13615] Add imageRegistry

components/tyk-bootstrap/templates/bootstrap-post-install.yaml

@@ -33,7 +33,7 @@ spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
       containers:
         - name: bootstrap-tyk-post-install
-          image: {{ .Values.bootstrap.jobs.postInstall.image.repository }}:{{ .Values.bootstrap.jobs.postInstall.image.tag }}
+          image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.postInstall.image.repository }}:{{ .Values.bootstrap.jobs.postInstall.image.tag }}
           command: [ '/app/bin/bootstrap-app-post' ]
           imagePullPolicy: IfNotPresent
           {{- if .Values.bootstrap.containerSecurityContext }}

components/tyk-bootstrap/templates/bootstrap-pre-delete.yaml

@@ -36,7 +36,7 @@ spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
       containers:
         - name: bootstrap-tyk-pre-delete
-          image: {{ .Values.bootstrap.jobs.preDelete.image.repository }}:{{ .Values.bootstrap.jobs.preDelete.image.tag }}
+          image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.preDelete.image.repository }}:{{ .Values.bootstrap.jobs.preDelete.image.tag }}
           command: [ '/app/bin/bootstrap-app-pre-delete' ]
           imagePullPolicy: IfNotPresent
           {{- if .Values.bootstrap.containerSecurityContext }}

components/tyk-bootstrap/templates/bootstrap-pre-install.yaml

@@ -32,7 +32,7 @@ spec:
       serviceAccountName: {{ default "k8s-bootstrap-role" .Values.bootstrap.serviceAccountName | quote }}
       containers:
         - name: bootstrap-tyk-pre-install
-          image: {{ .Values.bootstrap.jobs.preInstall.image.repository }}:{{ .Values.bootstrap.jobs.preInstall.image.tag }}
+          image: {{ .Values.global.imageRegistry }}{{ .Values.bootstrap.jobs.preInstall.image.repository }}:{{ .Values.bootstrap.jobs.preInstall.image.tag }}
           command: ['/app/bin/bootstrap-app-pre-install']
           imagePullPolicy: IfNotPresent
           {{- if .Values.bootstrap.containerSecurityContext }}

components/tyk-bootstrap/values.yaml

@@ -60,6 +60,8 @@ global:
     useSecretName: ""
     devPortal: tyk-dev-portal-conf
 
+  imageRegistry: ""
+
 bootstrap:
   # Trigger to control if we want to bootstrap the Developer Portal component using tyk-bootstrap
   devPortal: true

components/tyk-dashboard/templates/deployment-dashboard.yaml

@@ -62,7 +62,7 @@ spec:
       {{- if and $isSemVer (semverCompare "<=5.0.2" .Values.dashboard.image.tag) }}
       initContainers:
         - name: init-analytics-conf
-          image: busybox:1.32
+          image: {{ .Values.global.imageRegistry }}busybox:1.32
           args: ["sh", "-c", 'touch /etc/tyk-dashboard/tyk_analytics.conf && echo "{}" > /etc/tyk-dashboard/tyk_analytics.conf']
           {{- if .Values.dashboard.containerSecurityContext }}
           securityContext:
@@ -75,7 +75,7 @@ spec:
               name: analytics-conf
       {{- end }}
       containers:
-      - image: "{{ .Values.dashboard.image.repository }}:{{ .Values.dashboard.image.tag }}"
+      - image: "{{ .Values.global.imageRegistry }}{{ .Values.dashboard.image.repository }}:{{ .Values.dashboard.image.tag }}"
         imagePullPolicy: {{ .Values.dashboard.image.pullPolicy }}
         name: dashboard-{{ .Chart.Name }}
         {{- if .Values.dashboard.containerSecurityContext }}

components/tyk-dashboard/values.yaml

@@ -66,6 +66,8 @@ global:
     # a custom TLS certificate to avoid overwriting yours
     useDefaultTykCertificate: true
 
+  imageRegistry: ""
+
   # Choose the storageType for Tyk. [ "mongo", "postgres" ]
   storageType: postgres
 

components/tyk-dev-portal/templates/statefulset-enterprise-portal.yaml

@@ -60,7 +60,7 @@ spec:
       imagePullSecrets: {{ toYaml . | nindent 8 }}
       {{- end }}
       containers:
-      - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+      - image: "{{ .Values.global.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: dev-portal-{{ .Chart.Name }}
         {{- if .Values.containerSecurityContext }}

components/tyk-dev-portal/values.yaml

@@ -40,6 +40,8 @@ global:
     # In the context of the tyk-developer-portal only, this just runs the bootstrapping jobs only for the portal
     bootstrap: true
 
+  imageRegistry: ""
+
 # Sensitive configuration of Portal could be set using k8s secret
 # You can set following fields:
 # - DevPortalLicense - Sets LicenseKey for Developer Portal

components/tyk-gateway/templates/deployment-gw-repset.yaml

@@ -74,7 +74,7 @@ spec:
       {{- end }}
       initContainers:
       - name: "setup-directories"
-        image: "{{ .Values.gateway.initContainers.setupDirectories.repository }}:{{ .Values.gateway.initContainers.setupDirectories.tag }}"
+        image: "{{ .Values.global.imageRegistry }}{{ .Values.gateway.initContainers.setupDirectories.repository }}:{{ .Values.gateway.initContainers.setupDirectories.tag }}"
         command: ['sh','-c','mkdir -p apps middleware policies && touch policies/policies.json']
         workingDir: /mnt/tyk-gateway
         {{- if .Values.gateway.containerSecurityContext }}
@@ -88,7 +88,7 @@ spec:
             mountPath: /mnt/tyk-gateway
       containers:
       - name: gateway-{{ .Chart.Name }}
-        image: "{{ .Values.gateway.image.repository }}:{{ .Values.gateway.image.tag }}"
+        image: "{{ .Values.global.imageRegistry }}{{ .Values.gateway.image.repository }}:{{ .Values.gateway.image.tag }}"
         imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
         {{- if .Values.gateway.containerSecurityContext }}
         securityContext:

components/tyk-gateway/values.yaml

@@ -39,6 +39,8 @@ global:
     # - APISecret - Sets node_secret and secret in tyk.conf
     useSecretName: ""
 
+  imageRegistry: ""
+
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #

components/tyk-mdcb/templates/deployment-mdcb.yaml

@@ -39,7 +39,7 @@ spec:
         - name: mdcb-{{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.mdcb.containerSecurityContext | nindent 12 }}
-          image: "{{ .Values.mdcb.image.repository }}:{{ .Values.mdcb.image.tag }}"
+          image: "{{ .Values.global.imageRegistry }}{{ .Values.mdcb.image.repository }}:{{ .Values.mdcb.image.tag }}"
           imagePullPolicy: {{ .Values.mdcb.image.pullPolicy }}
           command: ["/opt/tyk-sink/tyk-sink", "--c=/etc/tyk-sink/tyk_mdcb.conf"]
           ports:

components/tyk-mdcb/values.yaml

@@ -1,4 +1,6 @@
 global:
+  imageRegistry: ""
+
   # Choose the storageType for Tyk. [ "mongo", "postgres" ]
   storageType: postgres
 

components/tyk-pump/templates/deployment-pmp.yaml

@@ -49,7 +49,7 @@ spec:
       {{- end }}
       containers:
       - name: pump-{{ .Chart.Name }}
-        image: "{{ .Values.pump.image.repository }}:{{ .Values.pump.image.tag }}"
+        image: "{{ .Values.global.imageRegistry }}{{ .Values.pump.image.repository }}:{{ .Values.pump.image.tag }}"
         imagePullPolicy: {{ .Values.pump.image.pullPolicy }}
         workingDir: "/opt/tyk-pump"
         ports:

components/tyk-pump/values.yaml

@@ -14,6 +14,7 @@ nameOverride: ""
 fullnameOverride: ""
 
 global:
+  imageRegistry: ""
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #

tyk-control-plane/values.yaml

@@ -87,6 +87,8 @@ global:
     # OperatorLicense - Tyk Operator license key
     useSecretName: ""
 
+  imageRegistry: ""
+
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #
@@ -721,7 +723,7 @@ tyk-pump:
 
     image:
       # image repository for Tyk pump
-      repository: docker.tyk.io/tyk-pump/tyk-pump
+      repository: tykio/tyk-pump-docker-pub
 
       # tag for Tyk pump
       tag: v1.11.0

tyk-data-plane/values.yaml

@@ -66,6 +66,8 @@ global:
     # - APISecret - Sets node_secret and secret in tyk.conf
     useSecretName: ""
 
+  imageRegistry: ""
+
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #
@@ -603,7 +605,7 @@ tyk-pump:
 
     image:
       # image repository for Tyk pump
-      repository: docker.tyk.io/tyk-pump/tyk-pump
+      repository: tykio/tyk-pump-docker-pub
 
       # tag for Tyk pump
       tag: v1.11.0

tyk-oss/values.yaml

@@ -50,6 +50,8 @@ global:
     # - OperatorLicense - Tyk Operator license key
     useSecretName: ""
 
+  imageRegistry: ""
+
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #

tyk-stack/values.yaml

@@ -88,6 +88,8 @@ global:
     # OperatorLicense - Tyk Operator license key
     useSecretName: ""
 
+  imageRegistry: ""
+
   redis:
     # The addrs value will allow you to set your Redis addresses.
     #
@@ -739,7 +741,7 @@ tyk-pump:
 
     image:
       # image repository for Tyk pump
-      repository: docker.tyk.io/tyk-pump/tyk-pump
+      repository: tykio/tyk-pump-docker-pub
 
       # tag for Tyk pump
       tag: v1.11.0
@@ -1140,7 +1142,7 @@ tyk-dashboard:
       # to avoid bootstrap job failure because of the OPA policy restrictions.
       # It is used to set TYK_DB_SECURITY_ALLOWADMINRESETPASSWORD
       allowAdminPasswordReset: true
-      
+
     # replicaCount specifies number of replicas to be created if kind is Deployment.
     replicaCount: 1