marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1646 from P4sca1/helm-update-shuffle

Browse Source 
Helm: Default to Chart app version for image tags
This commit is contained in:
Frikky
2025-03-30 23:57:42 +02:00
committed by GitHub
parent a3b0093cf5 e9b10a73cf
commit a018b7ee5b
6 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/extensions/k8s/shuffle/Chart.yaml
+2 -2
View File
@@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
version: 0.2.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.16.0"
appVersion: "2.0.0"
functions/kubernetes/charts/shuffle/Chart.yaml
+2 -2
View File
@@ -2,8 +2,8 @@ apiVersion: v2
name: shuffle
description: A Helm chart for deploying Shuffle on Kubernetes
type: application
version: 0.0.0
appVersion: 0.0.0
version: 0.0.0 # Set during publishing in GitHub actions
appVersion: nightly # Overwritten during publishing in GitHub actions
dependencies:
- name: common
version: ^2.23.0
functions/kubernetes/charts/shuffle/README.md
+6
View File
@@ -148,6 +148,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
| ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- |
| `backend.image.registry` | backend image registry | `ghcr.io` |
| `backend.image.repository` | backend image repository | `shuffle/shuffle-backend` |
| `backend.image.tag` | backend image tag (immutable tags are recommended, defaults to appVersion) | `""` |
| `backend.image.digest` | backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `backend.image.pullPolicy` | backend image pull policy | `IfNotPresent` |
| `backend.image.pullSecrets` | backend image pull secrets | `[]` |
@@ -265,6 +266,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
| ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------- |
| `frontend.image.registry` | frontend image registry | `ghcr.io` |
| `frontend.image.repository` | frontend image repository | `shuffle/shuffle-frontend` |
| `frontend.image.tag` | frontend image tag (immutable tags are recommended, defaults to appVersion) | `""` |
| `frontend.image.digest` | frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `frontend.image.pullPolicy` | frontend image pull policy | `IfNotPresent` |
| `frontend.image.pullSecrets` | frontend image pull secrets | `[]` |
@@ -373,6 +375,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
| ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
| `orborus.image.registry` | orborus image registry | `ghcr.io` |
| `orborus.image.repository` | orborus image repository | `shuffle/shuffle-orborus` |
| `orborus.image.tag` | orborus image tag (immutable tags are recommended, defaults to appVersion) | `""` |
| `orborus.image.digest` | orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `orborus.image.pullPolicy` | orborus image pull policy | `IfNotPresent` |
| `orborus.image.pullSecrets` | orborus image pull secrets | `[]` |
@@ -481,6 +484,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
| ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
| `worker.image.registry` | worker image registry | `ghcr.io` |
| `worker.image.repository` | worker image repository | `shuffle/shuffle-worker` |
| `worker.image.tag` | worker image tag (immutable tags are recommended, defaults to appVersion) | `""` |
| `worker.image.digest` | worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` |
| `worker.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
| `worker.serviceAccount.name` | The name of the ServiceAccount to use. | `""` |
@@ -582,6 +586,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` |
| `volumePermissions.image.registry` | OS Shell + Utility image registry | `docker.io` |
| `volumePermissions.image.repository` | OS Shell + Utility image repository | `bitnami/os-shell` |
| `volumePermissions.image.tag` | OS Shell + Utility image tag (immutable tags are recommended) | `12-debian-12-r30` |
| `volumePermissions.image.pullPolicy` | OS Shell + Utility image pull policy | `IfNotPresent` |
| `volumePermissions.image.pullSecrets` | OS Shell + Utility image pull secrets | `[]` |
| `volumePermissions.resourcesPreset` | Set init container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if volumePermissions.resources is set (volumePermissions.resources is recommended for production). | `nano` |
@@ -605,3 +610,4 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier"
### Other Parameters
functions/kubernetes/charts/shuffle/templates/_helpers.tpl
+5 -5
View File
@@ -119,14 +119,14 @@ app.kubernetes.io/name: shuffle-app
Return the proper image name (for the init container volume-permissions image)
*/}}
{{- define "shuffle.volumePermissions.image" -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global ) -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global "chart" .Chart ) -}}
{{- end -}}
{{/*
Return the proper Shuffle backend image name
*/}}
{{- define "shuffle.backend.image" -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.backend.image "global" .Values.global ) -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.backend.image "global" .Values.global "chart" .Chart ) -}}
{{- end -}}
{{/*
@@ -140,7 +140,7 @@ Return the proper Docker Image Registry Secret Names for the backend pod
Return the proper Shuffle frontend image name
*/}}
{{- define "shuffle.frontend.image" -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.frontend.image "global" .Values.global ) -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.frontend.image "global" .Values.global "chart" .Chart ) -}}
{{- end -}}
{{/*
@@ -154,7 +154,7 @@ Return the proper Docker Image Registry Secret Names for the frontend pod
Return the proper Shuffle orborus image name
*/}}
{{- define "shuffle.orborus.image" -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.orborus.image "global" .Values.global ) -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.orborus.image "global" .Values.global "chart" .Chart ) -}}
{{- end -}}
{{/*
@@ -168,7 +168,7 @@ Return the proper Docker Image Registry Secret Names for the orborus pod
Return the proper Shuffle worker image name
*/}}
{{- define "shuffle.worker.image" -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.worker.image "global" .Values.global ) -}}
{{- include "common.images.image" ( dict "imageRoot" .Values.worker.image "global" .Values.global "chart" .Chart ) -}}
{{- end -}}
{{/*
functions/kubernetes/charts/shuffle/values.schema.json
+25
View File
@@ -155,6 +155,11 @@
"description": "backend image repository",
"default": "shuffle/shuffle-backend"
},
"tag": {
"type": "string",
"description": "backend image tag (immutable tags are recommended, defaults to appVersion)",
"default": ""
},
"digest": {
"type": "string",
"description": "backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -839,6 +844,11 @@
"description": "frontend image repository",
"default": "shuffle/shuffle-frontend"
},
"tag": {
"type": "string",
"description": "frontend image tag (immutable tags are recommended, defaults to appVersion)",
"default": ""
},
"digest": {
"type": "string",
"description": "frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -1463,6 +1473,11 @@
"description": "orborus image repository",
"default": "shuffle/shuffle-orborus"
},
"tag": {
"type": "string",
"description": "orborus image tag (immutable tags are recommended, defaults to appVersion)",
"default": ""
},
"digest": {
"type": "string",
"description": "orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -2092,6 +2107,11 @@
"description": "worker image repository",
"default": "shuffle/shuffle-worker"
},
"tag": {
"type": "string",
"description": "worker image tag (immutable tags are recommended, defaults to appVersion)",
"default": ""
},
"digest": {
"type": "string",
"description": "worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)",
@@ -2591,6 +2611,11 @@
"description": "OS Shell + Utility image repository",
"default": "bitnami/os-shell"
},
"tag": {
"type": "string",
"description": "OS Shell + Utility image tag (immutable tags are recommended)",
"default": "12-debian-12-r30"
},
"pullPolicy": {
"type": "string",
"description": "OS Shell + Utility image pull policy",
functions/kubernetes/charts/shuffle/values.yaml
+9 -9
View File
@@ -96,7 +96,7 @@ backend:
## backend image
## @param backend.image.registry backend image registry
## @param backend.image.repository backend image repository
## @skip backend.image.tag backend image tag (immutable tags are recommended)
## @param backend.image.tag backend image tag (immutable tags are recommended, defaults to appVersion)
## @param backend.image.digest backend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
## @param backend.image.pullPolicy backend image pull policy
## @param backend.image.pullSecrets backend image pull secrets
@@ -104,7 +104,7 @@ backend:
image:
registry: ghcr.io
repository: shuffle/shuffle-backend
tag: nightly
tag: ""
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -565,7 +565,7 @@ frontend:
## frontend image
## @param frontend.image.registry frontend image registry
## @param frontend.image.repository frontend image repository
## @skip frontend.image.tag frontend image tag (immutable tags are recommended)
## @param frontend.image.tag frontend image tag (immutable tags are recommended, defaults to appVersion)
## @param frontend.image.digest frontend image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
## @param frontend.image.pullPolicy frontend image pull policy
## @param frontend.image.pullSecrets frontend image pull secrets
@@ -573,7 +573,7 @@ frontend:
image:
registry: ghcr.io
repository: shuffle/shuffle-frontend
tag: nightly
tag: ""
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -970,7 +970,7 @@ orborus:
## orborus image
## @param orborus.image.registry orborus image registry
## @param orborus.image.repository orborus image repository
## @skip orborus.image.tag orborus image tag (immutable tags are recommended)
## @param orborus.image.tag orborus image tag (immutable tags are recommended, defaults to appVersion)
## @param orborus.image.digest orborus image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
## @param orborus.image.pullPolicy orborus image pull policy
## @param orborus.image.pullSecrets orborus image pull secrets
@@ -978,7 +978,7 @@ orborus:
image:
registry: ghcr.io
repository: shuffle/shuffle-orborus
tag: nightly
tag: ""
digest: ""
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -1377,13 +1377,13 @@ worker:
## worker image
## @param worker.image.registry worker image registry
## @param worker.image.repository worker image repository
## @skip worker.image.tag worker image tag (immutable tags are recommended)
## @param worker.image.tag worker image tag (immutable tags are recommended, defaults to appVersion)
## @param worker.image.digest worker image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended)
##
image:
registry: ghcr.io
repository: shuffle/shuffle-worker
tag: nightly
tag: ""
digest: ""
## ServiceAccount configuration
@@ -1748,7 +1748,7 @@ volumePermissions:
## ref: https://hub.docker.com/r/bitnami/os-shell/tags/
## @param volumePermissions.image.registry OS Shell + Utility image registry
## @param volumePermissions.image.repository OS Shell + Utility image repository
## @skip volumePermissions.image.tag OS Shell + Utility image tag (immutable tags are recommended)
## @param volumePermissions.image.tag OS Shell + Utility image tag (immutable tags are recommended)
## @param volumePermissions.image.pullPolicy OS Shell + Utility image pull policy
## @param volumePermissions.image.pullSecrets OS Shell + Utility image pull secrets
##