andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated to epinio 1.9.0. also updated dex and minio dependencies.

pull/3215/head
Andreas Kupries 2023-09-14 10:35:22 +02:00 committed by Lucas Machado
parent a4c55d6eb4
commit 8ad9c9c9a9
12 changed files with 89 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/epinio/dex/generated-changes/patch/templates/deployment.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -45,7 +45,7 @@
@@ -55,7 +55,7 @@
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
@ -9,7 +9,7 @@
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
- dex
@@ -116,10 +116,8 @@
@@ -126,10 +126,8 @@
{{- with .Values.volumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
@ -21,7 +21,7 @@
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
@@ -128,7 +126,8 @@
@@ -138,7 +136,8 @@
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}

4
packages/epinio/dex/package.yaml
View File

@ -1,3 +1,3 @@
url: https://github.com/dexidp/helm-charts/releases/download/dex-0.14.1/dex-0.14.1.tgz
version: 101.0.1
url: https://github.com/dexidp/helm-charts/releases/download/dex-0.14.3/dex-0.14.3.tgz
version: 101.0.2
doNotRelease: true

9
packages/epinio/epinio/generated-changes/patch/Chart.yaml.patch
View File

@ -1,8 +1,9 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,5 +1,16 @@
@@ -1,6 +1,17 @@
annotations:
artifacthub.io/license: Apache-2.0
artifacthub.io/prerelease: "false"
+ catalog.cattle.io/auto-install: epinio-crd=match
+ catalog.cattle.io/certified: rancher
+ catalog.cattle.io/display-name: Epinio
@ -13,11 +14,11 @@
+ catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
+ catalog.cattle.io/release-name: epinio
+ catalog.cattle.io/type: app
+ catalog.cattle.io/upstream-version: 1.8.1
+ catalog.cattle.io/upstream-version: 1.9.0
apiVersion: v2
appVersion: v1.8.1
appVersion: v1.9.0
dependencies:
@@ -26,7 +37,7 @@
@@ -27,7 +38,7 @@
description: Epinio deploys Kubernetes applications directly from source code in one
step.
home: https://github.com/epinio/epinio

11
packages/epinio/epinio/generated-changes/patch/templates/default-app-chart.yaml.patch
View File

@ -1,11 +0,0 @@
--- charts-original/templates/default-app-chart.yaml
+++ charts/templates/default-app-chart.yaml
@@ -12,7 +12,7 @@
spec:
shortDescription: Epinio standard deployment
description: Epinio standard support chart for application deployment
- helmChart: https://github.com/epinio/helm-charts/releases/download/epinio-application-0.1.26/epinio-application-0.1.26.tgz
+ helmChart: /assets/epinio-application-0.1.26.tgz
settings:
appListeningPort:
type: 'integer'

4
packages/epinio/epinio/generated-changes/patch/templates/server.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/server.yaml
+++ charts/templates/server.yaml
@@ -256,8 +256,15 @@
@@ -260,8 +260,15 @@
app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.image.epinio.tag }}
name: epinio-server
spec:
@ -16,7 +16,7 @@
- name: tmp-volume
emptyDir: {}
- name: image-export-volume
@@ -333,6 +340,8 @@
@@ -350,6 +357,8 @@
ports:
- containerPort: 8030
volumeMounts:

17
packages/epinio/epinio/generated-changes/patch/values.yaml.patch
View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -11,30 +11,26 @@
@@ -9,32 +9,28 @@
email: "epinio@suse.com"
image:
epinio:
@ -8,18 +8,18 @@
- repository: epinio/epinio-server
- tag: ""
+ repository: rancher/mirrored-epinio-epinio-server
+ tag: v1.8.1
+ tag: v1.9.0
epinio-ui:
- registry: ghcr.io/
- repository: epinio/epinio-ui
+ repository: rancher/mirrored-epinio-epinio-ui
tag: v1.8.1-0.0.1
tag: v1.9.0-0.0.3
bash:
- registry: ghcr.io/
- repository: epinio/epinio-unpacker
- tag: ""
+ repository: rancher/mirrored-epinio-epinio-unpacker
+ tag: v1.8.1
+ tag: v1.9.0
awscli:
- repository: amazon/aws-cli
+ repository: rancher/mirrored-amazon-aws-cli
@ -37,11 +37,14 @@
- repository: paketobuildpacks/builder
- tag: full
+ repository: rancher/mirrored-paketobuildpacks-builder
+ tag: 0.2.407-full
+ tag: 0.2.441-full
appChart:
- default: https://github.com/epinio/helm-charts/releases/download/epinio-application-0.1.26/epinio-application-0.1.26.tgz
+ default: /assets/epinio-application-0.1.26.tgz
server:
# Domain which serves the Rancher UI (to access the API)
accessControlAllowOrigin: ""
@@ -155,10 +151,10 @@
@@ -178,10 +174,10 @@
enabled: true
image:
registry:
@ -54,7 +57,7 @@
tag: 1.23.2-alpine
imagePullPolicy: IfNotPresent
# The ingressClassName is used to select the ingress controller. If
@@ -168,6 +164,8 @@
@@ -195,6 +191,8 @@
# Enable service catalog service for development
enableDevServices: true
global:

4
packages/epinio/epinio/package.yaml
View File

@ -1,5 +1,5 @@
url: https://github.com/epinio/helm-charts/releases/download/epinio-1.8.1/epinio-1.8.1.tgz
version: 103.0.0
url: https://github.com/epinio/helm-charts/releases/download/epinio-1.9.0/epinio-1.9.0.tgz
version: 103.0.1
additionalCharts:
- workingDir: charts-crd
crdOptions:

36
packages/epinio/minio/generated-changes/patch/templates/deployment.yaml.patch
View File

@ -1,7 +1,7 @@
--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -72,7 +72,7 @@
{{- end }}
@@ -67,7 +67,7 @@
{{- end }}
containers:
- name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@ -9,28 +9,26 @@
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- "/bin/sh"
@@ -170,19 +170,18 @@
{{- toYaml . | nindent 8 }}
@@ -164,16 +164,17 @@
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
-{{- with .Values.nodeSelector }}
nodeSelector:
-{{ toYaml . | indent 8 }}
-{{- end }}
- {{- with .Values.nodeSelector }}
- nodeSelector: {{- toYaml . | nindent 8 }}
- {{- end }}
+ nodeSelector:
+ {{- include "linux-node-selector" . | nindent 8 }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
-{{- with .Values.tolerations }}
tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.tolerations }}
tolerations: {{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- include "linux-node-tolerations" . | nindent 8 }}
+ {{- with .Values.tolerations }}
+ {{ toYaml . | indent 8 }}
+ {{- end }}
volumes:
- name: export
{{- if .Values.persistence.enabled }}
{{- if .Values.persistence.enabled }}

44
packages/epinio/minio/generated-changes/patch/templates/post-job.yaml.patch
View File

@ -1,29 +1,38 @@
--- charts-original/templates/post-job.yaml
+++ charts/templates/post-job.yaml
@@ -31,18 +31,17 @@
@@ -29,15 +29,16 @@
spec:
restartPolicy: OnFailure
{{- include "minio.imagePullSecrets" . | nindent 6 }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
- {{- if .Values.nodeSelector }}
nodeSelector:
- {{- toYaml .Values.postJob.nodeSelector | nindent 8 }}
- nodeSelector: {{- toYaml .Values.postJob.nodeSelector | nindent 8 }}
- {{- end }}
+ nodeSelector:
+ {{- include "linux-node-selector" . | nindent 8 }}
{{- with .Values.postJob.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.postJob.tolerations }}
tolerations:
- tolerations: {{- toYaml . | nindent 8 }}
- {{- end }}
+ tolerations:
+ {{- include "linux-node-tolerations" . | nindent 8 }}
+ {{- with .Values.postJob.tolerations }}
{{- toYaml . | nindent 8 }}
- {{- end }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- if .Values.postJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.postJob.securityContext.runAsUser }}
@@ -86,7 +85,7 @@
@@ -88,7 +89,7 @@
{{- if .Values.policies }}
initContainers:
- name: minio-make-policy
- image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
+ image: "{{ default .Values.mcImage.registry (include "registry-url" .) }}{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
{{- if .Values.makePolicyJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.makePolicyJob.securityContext.runAsUser }}
@@ -122,7 +123,7 @@
containers:
{{- if .Values.buckets }}
- name: minio-make-bucket
@ -32,7 +41,7 @@
{{- if .Values.makeBucketJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.makeBucketJob.securityContext.runAsUser }}
@@ -116,7 +115,7 @@
@@ -155,7 +156,7 @@
{{- end }}
{{- if .Values.users }}
- name: minio-make-user
@ -41,16 +50,7 @@
{{- if .Values.makeUserJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.makeUserJob.securityContext.runAsUser }}
@@ -146,7 +145,7 @@
{{- end }}
{{- if .Values.policies }}
- name: minio-make-policy
- image: "{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
+ image: "{{ default .Values.mcImage.registry (include "registry-url" .) }}{{ .Values.mcImage.repository }}:{{ .Values.mcImage.tag }}"
{{- if .Values.makePolicyJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.makePolicyJob.securityContext.runAsUser }}
@@ -176,7 +175,7 @@
@@ -188,7 +189,7 @@
{{- end }}
{{- if .Values.customCommands }}
- name: minio-custom-command
@ -59,7 +59,7 @@
{{- if .Values.customCommandJob.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.customCommandJob.securityContext.runAsUser }}
@@ -206,7 +205,7 @@
@@ -221,7 +222,7 @@
{{- end }}
{{- if .Values.svcaccts }}
- name: minio-make-svcacct

45
packages/epinio/minio/generated-changes/patch/templates/statefulset.yaml.patch
View File

@ -1,36 +1,35 @@
--- charts-original/templates/statefulset.yaml
+++ charts/templates/statefulset.yaml
@@ -101,7 +101,7 @@
{{- end }}
@@ -95,7 +95,7 @@
{{- end }}
containers:
- name: {{ .Chart.Name }}
- image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+ image: "{{ default .Values.image.registry (include "registry-url" .) }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: [ "/bin/sh",
@@ -188,19 +188,18 @@
{{- toYaml . | nindent 8 }}
command: [
"/bin/sh",
@@ -182,16 +182,17 @@
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
- {{- with .Values.nodeSelector }}
nodeSelector:
-{{ toYaml . | indent 8 }}
- {{- end }}
- {{- with .Values.nodeSelector }}
- nodeSelector: {{- toYaml . | nindent 8 }}
- {{- end }}
+ nodeSelector:
+ {{- include "linux-node-selector" . | nindent 8 }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
- {{- with .Values.tolerations }}
tolerations:
-{{ toYaml . | indent 8 }}
- {{- end }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }}
affinity: {{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.tolerations }}
- tolerations: {{- toYaml . | nindent 8 }}
- {{- end }}
+ tolerations:
+ {{- include "linux-node-tolerations" . | nindent 8 }}
+ {{- with .Values.tolerations }}
+ {{ toYaml . | indent 8 }}
+ {{- end }}
{{- if and (gt $replicas 1) (ge .Capabilities.KubeVersion.Major "1") (ge .Capabilities.KubeVersion.Minor "19") }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints:
{{- if and (gt $replicas 1) (ge .Capabilities.KubeVersion.Major "1") (ge .Capabilities.KubeVersion.Minor "19") }}
{{- with .Values.topologySpreadConstraints }}
topologySpreadConstraints: {{- toYaml . | nindent 8 }}

4
packages/epinio/minio/generated-changes/patch/values.yaml.patch
View File

@ -6,7 +6,7 @@
image:
- repository: quay.io/minio/minio
+ repository: rancher/mirrored-minio-minio
tag: RELEASE.2023-02-10T18-48-39Z
tag: RELEASE.2023-07-07T07-13-57Z
pullPolicy: IfNotPresent
@@ -24,7 +24,7 @@
@ -15,6 +15,6 @@
mcImage:
- repository: quay.io/minio/mc
+ repository: rancher/mirrored-minio-mc
tag: RELEASE.2023-01-28T20-29-38Z
tag: RELEASE.2023-06-28T21-54-17Z
pullPolicy: IfNotPresent

4
packages/epinio/minio/package.yaml
View File

@ -1,3 +1,3 @@
url: https://charts.min.io/helm-releases/minio-5.0.7.tgz
version: 101.0.3
url: https://charts.min.io/helm-releases/minio-5.0.13.tgz
version: 101.0.4
doNotRelease: true