Make ghcr.io to default container registry (#2711)
* changed default container registry from docker.io to ghcr.io * user ghcr.io in CI test * use ghcr.io in reporter image * revert skaffold changes
This commit is contained in:
@@ -55,6 +55,22 @@ This template generates the image name for the deployment depending on the value
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- define "reporterImage" -}}
|
||||||
|
{{- if .Values.repository -}}
|
||||||
|
{{- if eq .Values.imageTag "" -}}
|
||||||
|
{{ .Values.repository }}/{{ .Values.postInstallReportImage }}
|
||||||
|
{{- else -}}
|
||||||
|
{{ .Values.repository }}/{{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
|
||||||
|
{{- end }}
|
||||||
|
{{- else -}}
|
||||||
|
{{- if eq .Values.imageTag "" -}}
|
||||||
|
{{ .Values.postInstallReportImage }}
|
||||||
|
{{- else -}}
|
||||||
|
{{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{- define "opentelemtry.envs" }}
|
{{- define "opentelemtry.envs" }}
|
||||||
- name: OTEL_EXPORTER_OTLP_ENDPOINT
|
- name: OTEL_EXPORTER_OTLP_ENDPOINT
|
||||||
value: "{{ .Values.openTelemetry.otlpCollectorEndpoint }}"
|
value: "{{ .Values.openTelemetry.otlpCollectorEndpoint }}"
|
||||||
|
|||||||
@@ -26,11 +26,7 @@ spec:
|
|||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
containers:
|
containers:
|
||||||
- name: post-install-job
|
- name: post-install-job
|
||||||
{{- if .Values.imageTag }}
|
image: {{ include "reporterImage" . | quote }}
|
||||||
image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
|
|
||||||
{{- else }}
|
|
||||||
image: {{ .Values.postInstallReportImage }}
|
|
||||||
{{- end }}
|
|
||||||
imagePullPolicy: {{ .Values.pullPolicy }}
|
imagePullPolicy: {{ .Values.pullPolicy }}
|
||||||
command: [ "/reporter" ]
|
command: [ "/reporter" ]
|
||||||
args: ["event", "-c", "fission-use", "-a", "yaml-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
args: ["event", "-c", "fission-use", "-a", "yaml-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
||||||
|
|||||||
@@ -30,11 +30,7 @@ spec:
|
|||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
containers:
|
containers:
|
||||||
- name: post-install-job
|
- name: post-install-job
|
||||||
{{- if .Values.imageTag }}
|
image: {{ include "reporterImage" . | quote }}
|
||||||
image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
|
|
||||||
{{- else }}
|
|
||||||
image: {{ .Values.postInstallReportImage }}
|
|
||||||
{{- end }}
|
|
||||||
imagePullPolicy: {{ .Values.pullPolicy }}
|
imagePullPolicy: {{ .Values.pullPolicy }}
|
||||||
command: [ "/reporter" ]
|
command: [ "/reporter" ]
|
||||||
args: ["event", "-c", "fission-use", "-a", "helm-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
args: ["event", "-c", "fission-use", "-a", "helm-post-install", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
||||||
|
|||||||
@@ -30,11 +30,7 @@ spec:
|
|||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
containers:
|
containers:
|
||||||
- name: post-upgrade-job
|
- name: post-upgrade-job
|
||||||
{{- if .Values.imageTag }}
|
image: {{ include "reporterImage" . | quote }}
|
||||||
image: {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
|
|
||||||
{{- else }}
|
|
||||||
image: {{ .Values.postInstallReportImage }}
|
|
||||||
{{- end }}
|
|
||||||
imagePullPolicy: {{ .Values.pullPolicy }}
|
imagePullPolicy: {{ .Values.pullPolicy }}
|
||||||
command: [ "/reporter" ]
|
command: [ "/reporter" ]
|
||||||
args: ["event", "-c", "fission-use", "-a", "helm-post-upgrade", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
args: ["event", "-c", "fission-use", "-a", "helm-post-upgrade", "-l", "{{ .Chart.Name }}-{{ .Chart.Version }}"]
|
||||||
|
|||||||
@@ -25,11 +25,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mqtrigger
|
- name: mqtrigger
|
||||||
{{- if eq .Values.imageTag "" }}
|
image: {{ include "fission-bundleImage" . | quote }}
|
||||||
image: "{{ .Values.image }}"
|
|
||||||
{{- else }}
|
|
||||||
image: "{{ .Values.image }}:{{ .Values.imageTag }}"
|
|
||||||
{{- end }}
|
|
||||||
imagePullPolicy: {{ .Values.pullPolicy }}
|
imagePullPolicy: {{ .Values.pullPolicy }}
|
||||||
command: ["/fission-bundle"]
|
command: ["/fission-bundle"]
|
||||||
args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
|
args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ routerServiceType: LoadBalancer
|
|||||||
## repository represents base repository for images used in the chart.
|
## repository represents base repository for images used in the chart.
|
||||||
## Keep it empty for using existing local image
|
## Keep it empty for using existing local image
|
||||||
##
|
##
|
||||||
repository: index.docker.io
|
repository: ghcr.io
|
||||||
|
|
||||||
## image represents the base image fission-bundle used by multiple Fission components.
|
## image represents the base image fission-bundle used by multiple Fission components.
|
||||||
## We alter arguments to the image to run a particular component.
|
## We alter arguments to the image to run a particular component.
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ manifests:
|
|||||||
preUpgradeChecks.imageTag: ""
|
preUpgradeChecks.imageTag: ""
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
prometheus.serviceEndpoint: ""
|
prometheus.serviceEndpoint: ""
|
||||||
repository: index.docker.io
|
repository: ghcr.io
|
||||||
routerServiceType: LoadBalancer
|
routerServiceType: LoadBalancer
|
||||||
runtimePodSpec.enabled: "false"
|
runtimePodSpec.enabled: "false"
|
||||||
serviceMonitor.additionalServiceMonitorLabels.release: prometheus
|
serviceMonitor.additionalServiceMonitorLabels.release: prometheus
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ ns="fission"
|
|||||||
ROOT=$(pwd)
|
ROOT=$(pwd)
|
||||||
PREV_STABLE_VERSION=v1.16.3
|
PREV_STABLE_VERSION=v1.16.3
|
||||||
HELM_VARS_PREV_RELEASE="routerServiceType=NodePort,analytics=false"
|
HELM_VARS_PREV_RELEASE="routerServiceType=NodePort,analytics=false"
|
||||||
HELM_VARS_LATEST_RELEASE="routerServiceType=NodePort,repository=docker.io/library,image=fission-bundle,pullPolicy=IfNotPresent,imageTag=latest,fetcher.image=docker.io/library/fetcher,fetcher.imageTag=latest,postInstallReportImage=reporter,preUpgradeChecks.image=preupgradechecks,preUpgradeChecks.imageTag=latest,analytics=false"
|
HELM_VARS_LATEST_RELEASE="routerServiceType=NodePort,repository=ghcr.io,image=fission/fission-bundle,pullPolicy=IfNotPresent,imageTag=latest,fetcher.image=fission/fetcher,fetcher.imageTag=latest,postInstallReportImage=fission/reporter,preUpgradeChecks.image=fission/pre-upgrade-checks,preUpgradeChecks.imageTag=latest,analytics=false"
|
||||||
|
|
||||||
doit() {
|
doit() {
|
||||||
echo "! $*"
|
echo "! $*"
|
||||||
|
|||||||
Reference in New Issue
Block a user