(dev-v2.6-archive) Add private registry support to rancher-pushprox

(partially cherry picked from commit d5a2f275f7)

packages/rancher-gatekeeper/rancher-gatekeeper.patch

@@ -19,18 +19,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/Cha
 +  catalog.cattle.io/experimental: true
 +  catalog.cattle.io/namespace: cattle-gatekeeper-system
 +  catalog.cattle.io/release-name: rancher-gatekeeper
-diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/README.md packages/rancher-gatekeeper/charts/README.md
---- packages/rancher-gatekeeper/charts-original/README.md
-+++ packages/rancher-gatekeeper/charts/README.md
-@@ -4,7 +4,7 @@
- 
- | Parameter                 | Description                                                                      | Default                                                                   |
- |:--------------------------|:---------------------------------------------------------------------------------|:--------------------------------------------------------------------------|
--| auditInterval             | The frequency with which audit is run                                            | `60`                                                                      |
-+| auditInterval             | The frequency with which audit is run                                            | `300`                                                                     |
- | constraintViolationsLimit | The maximum # of audit violations reported on a constraint                       | `20`                                                                      |
- | auditFromCache            | Take the roster of resources to audit from the OPA cache                         | `false`                                                                   |
- | auditChunkSize            | Chunk size for listing cluster resources for audit (alpha feature)               | `0`                                                                       |
 diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-gatekeeper/charts-original/crds/config-customresourcedefinition.yaml packages/rancher-gatekeeper/charts/crds/config-customresourcedefinition.yaml
 --- packages/rancher-gatekeeper/charts-original/crds/config-customresourcedefinition.yaml
 +++ packages/rancher-gatekeeper/charts/crds/config-customresourcedefinition.yaml

packages/rancher-pushprox/charts/templates/_helpers.tpl

@@ -1,3 +1,11 @@
+# Rancher
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
+{{- end -}}
+{{- end -}}
+
 # General
 
 {{- define "pushprox.namespace" -}}

packages/rancher-pushprox/charts/templates/pushprox-clients.yaml

@@ -26,7 +26,7 @@ spec:
       {{- end }}
       containers:
       - name: pushprox-client
-        image: {{ .Values.clients.image.repository }}:{{ .Values.clients.image.tag }}
+        image: {{ template "system_default_registry" . }}{{ .Values.clients.image.repository }}:{{ .Values.clients.image.tag }}
         command:
         {{- range .Values.clients.command }}
           - {{ . | quote }}
@@ -72,7 +72,7 @@ spec:
       {{- if and .Values.clients.https.enabled .Values.clients.https.certDir }}
       initContainers:
       - name: copy-certs
-        image: alpine:latest
+        image: {{ template "system_default_registry" . }}{{ .Values.clients.copyCertsImage.repository }}:{{ .Values.clients.copyCertsImage.tag }}
         command:
         - sh
         - -c

packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml

@@ -21,7 +21,7 @@ spec:
 {{- end }}
       containers:
       - name: pushprox-proxy
-        image: {{ .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}
+        image: {{ template "system_default_registry" . }}{{ .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}
         command:
         {{- range .Values.proxy.command }}
           - {{ . | quote }}

packages/rancher-pushprox/charts/values.yaml

@@ -12,6 +12,9 @@
 
 # Configuration
 
+global:
+  systemDefaultRegistry: ""
+
 # The component that is being monitored (i.e. etcd)
 component: "component"
 
@@ -60,6 +63,10 @@ clients:
     tag: v0.1.0-rancher1-client
   command: ["pushprox-client"]
 
+  copyCertsImage:
+    repository: rancher/kubectl
+    tag: v1.18.6
+
 proxy:
   enabled: true
   # The port through which PushProx clients will communicate to the proxy