Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Airgap possiblities #459

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Airgap possiblities #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/operators/templates/delete-csv-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/operators/templates/installplan-approval-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions charts/operators/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# empty
---

# Specify images and their versions
# override for airgap possiblities.
images:
origin_cli: quay.io/openshift/origin-cli:4.9
2 changes: 1 addition & 1 deletion charts/pelorus/templates/dashboard-snapshot-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/pelorus/templates/grafana-post-install-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/pelorus/templates/grafana.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/pelorus/templates/prometheus-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/pelorus/templates/thanos-query.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/pelorus/templates/thanos-store.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions charts/pelorus/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +32 to +38
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If these become mandatory values in values.yaml, then this becomes a breaking change. Right now, the configuration workflow is editing the values.yaml file in place instead of overriding it with various helm flags. We also want a minimalist values.yaml to still be valid.

To solve those problems, we should have these as defaults within the chart itself. In other words, image: {{ .Values.images.thanos | default "quay.io/thanos/thanos:v0.8.1" }}