Airgap (#1)

* Added airgap possiblities.
dora-metrics · May 17, 2022 · 3276663 · 3276663
1 parent 08332df
commit 3276663
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 13 deletions.
diff --git a/charts/operators/templates/delete-csv-hook.yaml b/charts/operators/templates/delete-csv-hook.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     spec:
       containers:
-        - image: quay.io/openshift/origin-cli:4.9
+        - image: {{ .Values.images.origin_cli }}
           command:
             - /bin/bash
             - -c

diff --git a/charts/operators/templates/installplan-approval-job.yaml b/charts/operators/templates/installplan-approval-job.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     spec:
       containers:
-        - image: quay.io/openshift/origin-cli:4.9
+        - image: {{ .Values.images.origin_cli }}
           command:
             - /bin/bash
             - -c

diff --git a/charts/operators/values.yaml b/charts/operators/values.yaml
@@ -1,2 +1,5 @@
-# empty
----
+
+# Specify images and their versions
+# override for airgap possiblities.
+images:
+  origin_cli: quay.io/openshift/origin-cli:4.9
diff --git a/charts/pelorus/templates/dashboard-snapshot-cronjob.yaml b/charts/pelorus/templates/dashboard-snapshot-cronjob.yaml
@@ -79,7 +79,7 @@ spec:
               snap_key=$(echo $snapshot | ./jq -r .key)
 
               echo "New Snapshot: https://${grafana_url}/dashboard/snapshot/${snap_key}"
-            image: quay.io/wto/web-terminal-tooling:1.2
+            image: {{ .Values.images.web_terminal_tooling }}
             name: dashboard-snapshots
           dnsPolicy: ClusterFirst
           restartPolicy: Never

diff --git a/charts/pelorus/templates/grafana-post-install-hook.yaml b/charts/pelorus/templates/grafana-post-install-hook.yaml
@@ -73,7 +73,7 @@ spec:
   template:
     spec:
       containers:
-        - image: quay.io/wto/web-terminal-tooling:1.2
+        - image: {{ .Values.images.web_terminal_tooling }}
           command:
             - /bin/bash
             - -c

diff --git a/charts/pelorus/templates/grafana.yaml b/charts/pelorus/templates/grafana.yaml
@@ -36,7 +36,7 @@ spec:
     - -openshift-ca=/etc/prometheus/configmaps/cluster-ca-bundle/ca-bundle.crt
 {{- end}}
     - '-skip-auth-regex=^/metrics|^/dashboard/snapshot|^/public|^/api'
-    image: image-registry.openshift-image-registry.svc.cluster.local:5000/openshift/oauth-proxy:v4.4
+    image: {{ .Values.images.oauth_proxy }}
     name: grafana-proxy
     ports:
       - containerPort: 9091

diff --git a/charts/pelorus/templates/prometheus-cr.yaml b/charts/pelorus/templates/prometheus-cr.yaml
@@ -7,8 +7,8 @@ metadata:
 spec:
   {{- if .Values.bucket_access_point }}
   thanos:
-    baseImage: quay.io/thanos/thanos
-    version: v0.8.1
+    baseImage: {{ (split ":" .Values.images.thanos)._0 }}
+    version: "v{{ (split ':' .Values.images.thanos)._1 }}"
     objectStorageConfig:
       key: thanos.yaml
       name: thanos-objstore-config
@@ -52,7 +52,7 @@ spec:
     - -openshift-ca=/etc/prometheus/configmaps/cluster-ca-bundle/ca-bundle.crt
 {{- end}}
     - -skip-auth-regex=^/metrics
-    image: image-registry.openshift-image-registry.svc.cluster.local:5000/openshift/oauth-proxy:v4.4
+    image: {{ .Values.images.oauth_proxy }}
     name: prometheus-proxy
     ports:
     - containerPort: 9091

diff --git a/charts/pelorus/templates/thanos-query.yml b/charts/pelorus/templates/thanos-query.yml
@@ -35,7 +35,7 @@ spec:
   {{- end }}
       containers:
       - name: thanos-query
-        image: quay.io/thanos/thanos:v0.8.1
+        image: {{ .Values.images.thanos }}
         args:
         - "query"
         - "--log.level=info"
@@ -70,7 +70,7 @@ spec:
         - -openshift-ca=/etc/prometheus/configmaps/cluster-ca-bundle/ca-bundle.crt
   {{- end}}
         - -skip-auth-regex=^/metrics
-        image: registry.redhat.io/openshift3/oauth-proxy:v3.11
+        image: {{ .Values.images.thanos_proxy }}
         name: thanos-proxy
         ports:
         - containerPort: 9092

diff --git a/charts/pelorus/templates/thanos-store.yml b/charts/pelorus/templates/thanos-store.yml
@@ -30,7 +30,7 @@ spec:
           name: trusted-certs
       containers:
       - name: thanos-store
-        image: quay.io/thanos/thanos:v0.8.1
+        image: {{ .Values.images.thanos }}
         args:
         - "store"
         - "--log.level=info"

diff --git a/charts/pelorus/values.yaml b/charts/pelorus/values.yaml
@@ -27,3 +27,12 @@ exporters:
     source_url: https://github.com/konveyor/pelorus.git
 
 snapshot_schedule: "@monthly"
+
+
+# Specify images and their versions
+# override for airgap possiblities.
+images:
+  oauth_proxy: image-registry.openshift-image-registry.svc.cluster.local:5000/openshift/oauth-proxy:v4.4
+  thanos: quay.io/thanos/thanos:v0.8.1
+  thanos_proxy: registry.redhat.io/openshift3/oauth-proxy:v3.11
+  web_terminal_tooling: quay.io/wto/web-terminal-tooling:1.2