From 7304b97d3ae5d8d3188f8bc5504ade0a0cac97cc Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 12:59:01 -0600 Subject: [PATCH 01/11] Adding a chart --- chart/Chart.yaml | 18 +++ chart/README.md | 47 +++++++ chart/templates/NOTES.txt | 44 ++++++ chart/templates/_helpers.tpl | 36 +++++ chart/templates/mariadb/configmap.yaml | 15 +++ chart/templates/mariadb/deployment.yaml | 59 ++++++++ .../mariadb/mariadb.volumeclaim.yaml | 22 +++ chart/templates/mariadb/service.yaml | 19 +++ chart/templates/resourcespace/deployment.yaml | 76 +++++++++++ .../resourcespace/filestore.volumeclaim.yaml | 22 +++ chart/templates/resourcespace/service.yaml | 19 +++ .../resourcespace/statics/configmap.yaml | 12 ++ chart/values.yaml | 126 ++++++++++++++++++ docker-compose.yaml | 6 + 14 files changed, 521 insertions(+) create mode 100644 chart/Chart.yaml create mode 100644 chart/README.md create mode 100644 chart/templates/NOTES.txt create mode 100644 chart/templates/_helpers.tpl create mode 100644 chart/templates/mariadb/configmap.yaml create mode 100644 chart/templates/mariadb/deployment.yaml create mode 100644 chart/templates/mariadb/mariadb.volumeclaim.yaml create mode 100644 chart/templates/mariadb/service.yaml create mode 100644 chart/templates/resourcespace/deployment.yaml create mode 100644 chart/templates/resourcespace/filestore.volumeclaim.yaml create mode 100644 chart/templates/resourcespace/service.yaml create mode 100644 chart/templates/resourcespace/statics/configmap.yaml create mode 100644 chart/values.yaml diff --git a/chart/Chart.yaml b/chart/Chart.yaml new file mode 100644 index 0000000..feca3df --- /dev/null +++ b/chart/Chart.yaml @@ -0,0 +1,18 @@ +# This is the main values.yaml file for the resourcespace_docker chart. +# More information can be found in the chart's README.md file. +# +# generated at: 2025-11-24T12:56:25-06:00 +# compose files: docker-compose.yaml +# compose hash (sha1): 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + +# Name of the chart (required), basically the name of the project. +name: resourcespace_docker +apiVersion: v2 + +# Version of the chart (required) +version: 0.1.0 + +# Version of the application (required). +# This should be the main application version. +appVersion: 0.1.0 +description: A Helm chart for resourcespace_docker diff --git a/chart/README.md b/chart/README.md new file mode 100644 index 0000000..5732bd5 --- /dev/null +++ b/chart/README.md @@ -0,0 +1,47 @@ +# resourcespace_docker + +A Helm chart for resourcespace_docker + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```bash +# Standard Helm install +$ helm install my-release resourcespace_docker + +# To use a custom namespace and force the creation of the namespace +$ helm install my-release --namespace my-namespace --create-namespace resourcespace_docker + +# To use a custom values file +$ helm install my-release -f my-values.yaml resourcespace_docker +``` + +See the [Helm documentation](https://helm.sh/docs/intro/using_helm/) for more information on installing and managing the chart. + +## Configuration + +The following table lists the configurable parameters of the resourcespace_docker chart and their default values. + +| Parameter | Default | +| --------------------------------------------------------- | --------------- | +| `mariadb.imagePullPolicy` | `IfNotPresent` | +| `mariadb.persistence.mariadb.accessMode[0].value` | `ReadWriteOnce` | +| `mariadb.persistence.mariadb.enabled` | `true` | +| `mariadb.persistence.mariadb.size` | `1Gi` | +| `mariadb.persistence.mariadb.storageClass` | `-` | +| `mariadb.replicas` | `1` | +| `mariadb.repository.image` | `mariadb` | +| `mariadb.repository.tag` | `` | +| `mariadb.serviceAccount` | `` | +| `resourcespace.imagePullPolicy` | `IfNotPresent` | +| `resourcespace.persistence.filestore.accessMode[0].value` | `ReadWriteOnce` | +| `resourcespace.persistence.filestore.enabled` | `true` | +| `resourcespace.persistence.filestore.size` | `1Gi` | +| `resourcespace.persistence.filestore.storageClass` | `-` | +| `resourcespace.replicas` | `1` | +| `resourcespace.repository.image` | `` | +| `resourcespace.repository.tag` | `` | +| `resourcespace.serviceAccount` | `` | + + diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt new file mode 100644 index 0000000..1f7c017 --- /dev/null +++ b/chart/templates/NOTES.txt @@ -0,0 +1,44 @@ +Thanks to have installed {{ .Chart.Name }} {{ .Chart.Version }} as {{ .Release.Name }} ({{.Chart.AppVersion }}). + +# Get release information + +To learn more about the release, try: + + $ helm -n {{ .Release.Namespace }} status {{ .Release.Name }} + $ helm -n {{ .Release.Namespace }} get values {{ .Release.Name }} + $ helm -n {{ .Release.Namespace }} get all {{ .Release.Name }} + +# To delete the release + +Use helm uninstall command to delete the release. + + $ helm -n {{ .Release.Namespace }} uninstall {{ .Release.Name }} + +Note that some resources may still be in use after a release is deleted. For exemple, PersistentVolumeClaims are not deleted by default for some storage classes or if some annotations are set. + +# More information + +You can see this notes again by running: + + $ helm -n {{ .Release.Namespace }} get notes {{ .Release.Name }} + +{{- $count := 0 -}} +{{- $listOfURL := "" -}} +{{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} +{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} +{{- end }} +{{- if and .Values.resourcespace.ingress .Values.resourcespace.ingress.enabled }} +{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.resourcespace.ingress.host .) -}} +{{- end }} +{{- if gt $count 0 }} + +# List of activated ingresses URL: +{{ $listOfURL }} + +You can get these urls with kubectl: + + kubeclt get ingress -n {{ .Release.Namespace }} + +{{- end }} + +Thanks for using Helm! diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl new file mode 100644 index 0000000..ee4977c --- /dev/null +++ b/chart/templates/_helpers.tpl @@ -0,0 +1,36 @@ +{{- define "resourcespace_docker.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{- define "resourcespace_docker.name" -}} +{{- if .Values.nameOverride -}} +{{- .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} + +{{- define "resourcespace_docker.labels" -}} +{{ include "resourcespace_docker.selectorLabels" .}} +{{ if .Chart.Version -}} +{{ printf "katenary.v3/chart-version: '%s'" .Chart.Version }} +{{- end }} +{{ if .Chart.AppVersion -}} +{{ printf "katenary.v3/app-version: '%s'" .Chart.AppVersion }} +{{- end }} +{{- end -}} + +{{- define "resourcespace_docker.selectorLabels" -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{ printf "katenary.v3/name: %s" $name }} +{{ printf "katenary.v3/instance: %s" .Release.Name }} +{{- end -}} diff --git a/chart/templates/mariadb/configmap.yaml b/chart/templates/mariadb/configmap.yaml new file mode 100644 index 0000000..4762dd6 --- /dev/null +++ b/chart/templates/mariadb/configmap.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +data: + MYSQL_DATABASE: resourcespace + MYSQL_PASSWORD: change-me + MYSQL_ROOT_PASSWORD: change-me + MYSQL_USER: resourcespace_rw +kind: ConfigMap +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: mariadb + name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' diff --git a/chart/templates/mariadb/deployment.yaml b/chart/templates/mariadb/deployment.yaml new file mode 100644 index 0000000..af7da70 --- /dev/null +++ b/chart/templates/mariadb/deployment.yaml @@ -0,0 +1,59 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: mariadb + name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' +spec: + replicas: {{ .Values.mariadb.replicas }} + selector: + matchLabels: + {{- include "resourcespace_docker.selectorLabels" . | nindent 6 }} + katenary.v3/component: mariadb + strategy: {} + template: + metadata: + labels: + {{- include "resourcespace_docker.selectorLabels" . | nindent 8 }} + katenary.v3/component: mariadb + spec: + containers: + - envFrom: + - configMapRef: + name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' + image: '{{ tpl .Values.mariadb.repository.image $ }}:{{ tpl .Values.mariadb.repository.tag $ | default "latest" }}' + imagePullPolicy: {{ .Values.mariadb.imagePullPolicy }} + name: mariadb + ports: + - containerPort: 3306 + name: mysql + {{- if .Values.mariadb.resources }} + resources: + {{ .Values.mariadb.resources | toYaml | nindent 10 }} + {{- end }} + volumeMounts: + {{- if .Values.mariadb.persistence.mariadb.enabled }} + - mountPath: /var/lib/mysql + name: mariadb + {{- end }} + {{- if .Values.pullSecrets }} + imagePullSecrets: + {{- .Values.pullSecrets | toYaml | nindent 6 }} + {{- end }} + {{- if .Values.mariadb.nodeSelector }} + nodeSelector: + {{- .Values.mariadb.nodeSelector | toYaml | nindent 8 }} + {{- end }} + {{- if ne .Values.mariadb.serviceAccount "" }} + serviceAccountName: {{ .Values.mariadb.serviceAccount | quote }} + {{- end }} + volumes: + {{- if .Values.mariadb.persistence.mariadb.enabled }} + - name: mariadb + persistentVolumeClaim: + claimName: '{{ include "resourcespace_docker.fullname" . }}-mariadb-mariadb' + {{- end }} diff --git a/chart/templates/mariadb/mariadb.volumeclaim.yaml b/chart/templates/mariadb/mariadb.volumeclaim.yaml new file mode 100644 index 0000000..3848d70 --- /dev/null +++ b/chart/templates/mariadb/mariadb.volumeclaim.yaml @@ -0,0 +1,22 @@ +{{- if .Values.mariadb.persistence.mariadb.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: mariadb + name: '{{ include "resourcespace_docker.fullname" . }}-mariadb-mariadb' +spec: + accessModes: + {{- .Values.mariadb.persistence.mariadb.accessMode | toYaml | nindent 2 }} + resources: + requests: + storage: {{ tpl .Values.mariadb.persistence.mariadb.size $ }} + {{- if ne .Values.mariadb.persistence.mariadb.storageClass "-" }} + storageClassName: '{{ .Values.mariadb.persistence.mariadb.storageClass }}' + {{- end }} + +{{- end }} \ No newline at end of file diff --git a/chart/templates/mariadb/service.yaml b/chart/templates/mariadb/service.yaml new file mode 100644 index 0000000..18f7847 --- /dev/null +++ b/chart/templates/mariadb/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: mariadb + name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' +spec: + ports: + - name: mysql + port: 3306 + protocol: TCP + targetPort: mysql + selector: + {{- include "resourcespace_docker.selectorLabels" . | nindent 4 }} + katenary.v3/component: mariadb diff --git a/chart/templates/resourcespace/deployment.yaml b/chart/templates/resourcespace/deployment.yaml new file mode 100644 index 0000000..613d2e5 --- /dev/null +++ b/chart/templates/resourcespace/deployment.yaml @@ -0,0 +1,76 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: resourcespace + name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' +spec: + replicas: {{ .Values.resourcespace.replicas }} + selector: + matchLabels: + {{- include "resourcespace_docker.selectorLabels" . | nindent 6 }} + katenary.v3/component: resourcespace + strategy: {} + template: + metadata: + labels: + {{- include "resourcespace_docker.selectorLabels" . | nindent 8 }} + katenary.v3/component: resourcespace + spec: + containers: + - image: '{{ tpl .Values.resourcespace.repository.image $ }}:{{ tpl .Values.resourcespace.repository.tag $ | default "latest" }}' + imagePullPolicy: {{ .Values.resourcespace.imagePullPolicy }} + name: resourcespace + ports: + - containerPort: 80 + name: http + {{- if .Values.resourcespace.resources }} + resources: + {{ .Values.resourcespace.resources | toYaml | nindent 10 }} + {{- end }} + volumeMounts: + {{- if .Values.resourcespace.persistence.filestore.enabled }} + - mountPath: /var/www/html/filestore + name: filestore + {{- end }} + - mountPath: /var/www/html/include/config.php + name: config-php + subPath: config.php + {{- if .Values.pullSecrets }} + imagePullSecrets: + {{- .Values.pullSecrets | toYaml | nindent 6 }} + {{- end }} + initContainers: + - command: + - /bin/sh + - -c + - |- + until nc -z {{ include "resourcespace_docker.fullname" . }}-mariadb 3306; do + sleep 1; + done + image: busybox:latest + name: wait-for-mariadb + {{- if .Values.resourcespace.resources }} + resources: + {{ .Values.resourcespace.resources | toYaml | nindent 10 }} + {{- end }} + {{- if .Values.resourcespace.nodeSelector }} + nodeSelector: + {{- .Values.resourcespace.nodeSelector | toYaml | nindent 8 }} + {{- end }} + {{- if ne .Values.resourcespace.serviceAccount "" }} + serviceAccountName: {{ .Values.resourcespace.serviceAccount | quote }} + {{- end }} + volumes: + {{- if .Values.resourcespace.persistence.filestore.enabled }} + - name: filestore + persistentVolumeClaim: + claimName: '{{ include "resourcespace_docker.fullname" . }}-resourcespace-filestore' + {{- end }} + - configMap: + name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' + name: config-php diff --git a/chart/templates/resourcespace/filestore.volumeclaim.yaml b/chart/templates/resourcespace/filestore.volumeclaim.yaml new file mode 100644 index 0000000..d963411 --- /dev/null +++ b/chart/templates/resourcespace/filestore.volumeclaim.yaml @@ -0,0 +1,22 @@ +{{- if .Values.resourcespace.persistence.filestore.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: resourcespace + name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace-filestore' +spec: + accessModes: + {{- .Values.resourcespace.persistence.filestore.accessMode | toYaml | nindent 2 }} + resources: + requests: + storage: {{ tpl .Values.resourcespace.persistence.filestore.size $ }} + {{- if ne .Values.resourcespace.persistence.filestore.storageClass "-" }} + storageClassName: '{{ .Values.resourcespace.persistence.filestore.storageClass }}' + {{- end }} + +{{- end }} \ No newline at end of file diff --git a/chart/templates/resourcespace/service.yaml b/chart/templates/resourcespace/service.yaml new file mode 100644 index 0000000..888bbc7 --- /dev/null +++ b/chart/templates/resourcespace/service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: resourcespace + name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: http + selector: + {{- include "resourcespace_docker.selectorLabels" . | nindent 4 }} + katenary.v3/component: resourcespace diff --git a/chart/templates/resourcespace/statics/configmap.yaml b/chart/templates/resourcespace/statics/configmap.yaml new file mode 100644 index 0000000..4fb8499 --- /dev/null +++ b/chart/templates/resourcespace/statics/configmap.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +data: + config.php: "" +kind: ConfigMap +metadata: + annotations: + katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/version: master + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: resourcespace + name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' diff --git a/chart/values.yaml b/chart/values.yaml new file mode 100644 index 0000000..3b81e92 --- /dev/null +++ b/chart/values.yaml @@ -0,0 +1,126 @@ +# This file is autogenerated by katenary +# +# DO NOT EDIT IT BY HAND UNLESS YOU KNOW WHAT YOU ARE DOING +# +# If you want to change the content of this file, you should edit the +# compose file and run katenary again. +# If you need to override some values, you can do it in a override file +# and use the -f flag to specify it when running the helm command. + + + +# mariadb configuration +mariadb: + # key: mariadb.repository + repository: + # key: mariadb.repository.image + image: mariadb + # key: mariadb.repository.tag + tag: "" + # key: mariadb.persistence + persistence: + # key: mariadb.persistence.mariadb + mariadb: + # Storage class to use for PVCs + # storageClass: "-" means use default + # storageClass: "" means do not specify + # storageClass: "foo" means use that storageClass + # key: mariadb.persistence.mariadb.storageClass + storageClass: '-' + # key: mariadb.persistence.mariadb.size + size: 1Gi + # key: mariadb.persistence.mariadb.accessMode + accessMode: + - ReadWriteOnce + # key: mariadb.persistence.mariadb.enabled + enabled: true + # key: mariadb.replicas + replicas: 1 + # key: mariadb.nodeSelector + nodeSelector: {} + # Resources allows you to specify the resource requests and limits for a service. + # Resources are used to specify the amount of CPU and memory that + # a container needs. + # + # e.g. + # resources: + # requests: + # memory: "64Mi" + # cpu: "250m" + # limits: + # memory: "128Mi" + # cpu: "500m" + # key: mariadb.resources + resources: {} + # imagePullPolicy allows you to specify a policy to cache or always pull an image. + # You must provide a string value with one of the following values: + # - Always -> will always pull the image + # - Never -> will never pull the image, the image should be present on the node + # - IfNotPresent -> will pull the image only if it is not present on the node + # key: mariadb.imagePullPolicy + imagePullPolicy: IfNotPresent + # key: mariadb.serviceAccount + serviceAccount: "" + +# imagePullSecrets allows you to specify a name of an image pull secret. +# You must provide a list of object with the name field set to the name of the +# e.g. +# pullSecrets: +# - name: regcred +# You are, for now, responsible for creating the secret. +pullSecrets: [] + +# resourcespace configuration +resourcespace: + # key: resourcespace.repository + repository: + # key: resourcespace.repository.image + image: "" + # key: resourcespace.repository.tag + tag: "" + # key: resourcespace.persistence + persistence: + # key: resourcespace.persistence.filestore + filestore: + # Storage class to use for PVCs + # storageClass: "-" means use default + # storageClass: "" means do not specify + # storageClass: "foo" means use that storageClass + # key: resourcespace.persistence.filestore.storageClass + storageClass: '-' + # key: resourcespace.persistence.filestore.size + size: 1Gi + # key: resourcespace.persistence.filestore.accessMode + accessMode: + - ReadWriteOnce + # key: resourcespace.persistence.filestore.enabled + enabled: true + # key: resourcespace.replicas + replicas: 1 + # key: resourcespace.nodeSelector + nodeSelector: {} + # Resources allows you to specify the resource requests and limits for a service. + # Resources are used to specify the amount of CPU and memory that + # a container needs. + # + # e.g. + # resources: + # requests: + # memory: "64Mi" + # cpu: "250m" + # limits: + # memory: "128Mi" + # cpu: "500m" + # key: resourcespace.resources + resources: {} + # imagePullPolicy allows you to specify a policy to cache or always pull an image. + # You must provide a string value with one of the following values: + # - Always -> will always pull the image + # - Never -> will never pull the image, the image should be present on the node + # - IfNotPresent -> will pull the image only if it is not present on the node + # key: resourcespace.imagePullPolicy + imagePullPolicy: IfNotPresent + # key: resourcespace.serviceAccount + serviceAccount: "" + +# vim: ft=yaml diff --git a/docker-compose.yaml b/docker-compose.yaml index cc20f52..8ed2a78 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,6 +8,9 @@ services: volumes: - filestore:/var/www/html/filestore - ./config.php:/var/www/html/include/config.php + labels: + katenary.v3/configmap-files: |- + - ./config.php networks: - frontend - backend @@ -24,6 +27,9 @@ services: - mariadb:/var/lib/mysql networks: - backend + labels: + katenary.v3/ports: |- + - 3306 networks: frontend: From 03c9b97e2fdad6f3d6b1c1fe7caa63dbf8cc21dd Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 13:13:07 -0600 Subject: [PATCH 02/11] action --- .github/workflows/release.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..f23740d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,27 @@ +name: Release Charts + +on: + push: + branches: + - main + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.7.0 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From fa23c6ad6bbc9a824cf7476efa8291942c2f4102 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 15:32:53 -0600 Subject: [PATCH 03/11] update to katenary 3.0.0 --- chart/Chart.yaml | 2 +- chart/templates/NOTES.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index feca3df..f2397e9 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,7 +1,7 @@ # This is the main values.yaml file for the resourcespace_docker chart. # More information can be found in the chart's README.md file. # -# generated at: 2025-11-24T12:56:25-06:00 +# generated at: 2025-11-24T15:32:12-06:00 # compose files: docker-compose.yaml # compose hash (sha1): 7ef9ff871f6607662d992bcbf313e5f61d10ae7a diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 1f7c017..ce26270 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -24,12 +24,12 @@ You can see this notes again by running: {{- $count := 0 -}} {{- $listOfURL := "" -}} -{{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} -{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} -{{- end }} {{- if and .Values.resourcespace.ingress .Values.resourcespace.ingress.enabled }} {{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.resourcespace.ingress.host .) -}} {{- end }} +{{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} +{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} +{{- end }} {{- if gt $count 0 }} # List of activated ingresses URL: From 94c67c20ecaba9f91197698424996f4f38c607d6 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 15:52:08 -0600 Subject: [PATCH 04/11] chart --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f23740d..04d4d23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,5 +23,8 @@ jobs: - name: Run chart-releaser uses: helm/chart-releaser-action@v1.7.0 + with: + charts_dir: chart + pages_branch: gh-pages env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From ba82b30e486d20f199c842e72ef81000371c0bf7 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 15:56:40 -0600 Subject: [PATCH 05/11] dotslash --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04d4d23..c6048e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - name: Run chart-releaser uses: helm/chart-releaser-action@v1.7.0 with: - charts_dir: chart + charts_dir: ./ pages_branch: gh-pages env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From eaaf5fb465453f1b19a50a8f589394d3b4e341de Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 16:23:06 -0600 Subject: [PATCH 06/11] 0.1.1 --- chart/Chart.yaml | 8 ++-- chart/README.md | 46 +++++++++++-------- chart/templates/NOTES.txt | 6 +-- chart/templates/mariadb/configmap.yaml | 2 +- chart/templates/mariadb/deployment.yaml | 2 +- .../mariadb/mariadb.volumeclaim.yaml | 2 +- chart/templates/mariadb/service.yaml | 2 +- chart/templates/resourcespace/deployment.yaml | 2 +- .../resourcespace/filestore.volumeclaim.yaml | 2 +- chart/templates/resourcespace/ingress.yaml | 39 ++++++++++++++++ chart/templates/resourcespace/service.yaml | 2 +- .../resourcespace/statics/configmap.yaml | 2 +- chart/values.yaml | 28 +++++++++++ docker-compose.yaml | 3 ++ 14 files changed, 111 insertions(+), 35 deletions(-) create mode 100644 chart/templates/resourcespace/ingress.yaml diff --git a/chart/Chart.yaml b/chart/Chart.yaml index f2397e9..c452efe 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,18 +1,18 @@ # This is the main values.yaml file for the resourcespace_docker chart. # More information can be found in the chart's README.md file. # -# generated at: 2025-11-24T15:32:12-06:00 +# generated at: 2025-11-24T16:22:22-06:00 # compose files: docker-compose.yaml -# compose hash (sha1): 7ef9ff871f6607662d992bcbf313e5f61d10ae7a +# compose hash (sha1): 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 # Name of the chart (required), basically the name of the project. name: resourcespace_docker apiVersion: v2 # Version of the chart (required) -version: 0.1.0 +version: 0.1.1 # Version of the application (required). # This should be the main application version. -appVersion: 0.1.0 +appVersion: 0.1.1 description: A Helm chart for resourcespace_docker diff --git a/chart/README.md b/chart/README.md index 5732bd5..a8287e9 100644 --- a/chart/README.md +++ b/chart/README.md @@ -23,25 +23,31 @@ See the [Helm documentation](https://helm.sh/docs/intro/using_helm/) for more in The following table lists the configurable parameters of the resourcespace_docker chart and their default values. -| Parameter | Default | -| --------------------------------------------------------- | --------------- | -| `mariadb.imagePullPolicy` | `IfNotPresent` | -| `mariadb.persistence.mariadb.accessMode[0].value` | `ReadWriteOnce` | -| `mariadb.persistence.mariadb.enabled` | `true` | -| `mariadb.persistence.mariadb.size` | `1Gi` | -| `mariadb.persistence.mariadb.storageClass` | `-` | -| `mariadb.replicas` | `1` | -| `mariadb.repository.image` | `mariadb` | -| `mariadb.repository.tag` | `` | -| `mariadb.serviceAccount` | `` | -| `resourcespace.imagePullPolicy` | `IfNotPresent` | -| `resourcespace.persistence.filestore.accessMode[0].value` | `ReadWriteOnce` | -| `resourcespace.persistence.filestore.enabled` | `true` | -| `resourcespace.persistence.filestore.size` | `1Gi` | -| `resourcespace.persistence.filestore.storageClass` | `-` | -| `resourcespace.replicas` | `1` | -| `resourcespace.repository.image` | `` | -| `resourcespace.repository.tag` | `` | -| `resourcespace.serviceAccount` | `` | +| Parameter | Default | +| --------------------------------------------------------- | -------------------------- | +| `mariadb.imagePullPolicy` | `IfNotPresent` | +| `mariadb.persistence.mariadb.accessMode[0].value` | `ReadWriteOnce` | +| `mariadb.persistence.mariadb.enabled` | `true` | +| `mariadb.persistence.mariadb.size` | `1Gi` | +| `mariadb.persistence.mariadb.storageClass` | `-` | +| `mariadb.replicas` | `1` | +| `mariadb.repository.image` | `mariadb` | +| `mariadb.repository.tag` | `` | +| `mariadb.serviceAccount` | `` | +| `resourcespace.imagePullPolicy` | `IfNotPresent` | +| `resourcespace.ingress.class` | `-` | +| `resourcespace.ingress.enabled` | `false` | +| `resourcespace.ingress.host` | `mywebsite.com (optional)` | +| `resourcespace.ingress.path` | `/` | +| `resourcespace.ingress.tls.enabled` | `true` | +| `resourcespace.ingress.tls.secretName` | `` | +| `resourcespace.persistence.filestore.accessMode[0].value` | `ReadWriteOnce` | +| `resourcespace.persistence.filestore.enabled` | `true` | +| `resourcespace.persistence.filestore.size` | `1Gi` | +| `resourcespace.persistence.filestore.storageClass` | `-` | +| `resourcespace.replicas` | `1` | +| `resourcespace.repository.image` | `` | +| `resourcespace.repository.tag` | `` | +| `resourcespace.serviceAccount` | `` | diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index ce26270..1f7c017 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -24,12 +24,12 @@ You can see this notes again by running: {{- $count := 0 -}} {{- $listOfURL := "" -}} -{{- if and .Values.resourcespace.ingress .Values.resourcespace.ingress.enabled }} -{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.resourcespace.ingress.host .) -}} -{{- end }} {{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} {{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} {{- end }} +{{- if and .Values.resourcespace.ingress .Values.resourcespace.ingress.enabled }} +{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.resourcespace.ingress.host .) -}} +{{- end }} {{- if gt $count 0 }} # List of activated ingresses URL: diff --git a/chart/templates/mariadb/configmap.yaml b/chart/templates/mariadb/configmap.yaml index 4762dd6..54fd2e5 100644 --- a/chart/templates/mariadb/configmap.yaml +++ b/chart/templates/mariadb/configmap.yaml @@ -7,7 +7,7 @@ data: kind: ConfigMap metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/deployment.yaml b/chart/templates/mariadb/deployment.yaml index af7da70..3bc02a4 100644 --- a/chart/templates/mariadb/deployment.yaml +++ b/chart/templates/mariadb/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/mariadb.volumeclaim.yaml b/chart/templates/mariadb/mariadb.volumeclaim.yaml index 3848d70..0e8b03b 100644 --- a/chart/templates/mariadb/mariadb.volumeclaim.yaml +++ b/chart/templates/mariadb/mariadb.volumeclaim.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/service.yaml b/chart/templates/mariadb/service.yaml index 18f7847..2445bbb 100644 --- a/chart/templates/mariadb/service.yaml +++ b/chart/templates/mariadb/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/deployment.yaml b/chart/templates/resourcespace/deployment.yaml index 613d2e5..b801058 100644 --- a/chart/templates/resourcespace/deployment.yaml +++ b/chart/templates/resourcespace/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/filestore.volumeclaim.yaml b/chart/templates/resourcespace/filestore.volumeclaim.yaml index d963411..1846392 100644 --- a/chart/templates/resourcespace/filestore.volumeclaim.yaml +++ b/chart/templates/resourcespace/filestore.volumeclaim.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/ingress.yaml b/chart/templates/resourcespace/ingress.yaml new file mode 100644 index 0000000..ebbb92a --- /dev/null +++ b/chart/templates/resourcespace/ingress.yaml @@ -0,0 +1,39 @@ +{{- if .Values.resourcespace.ingress.enabled -}} +{{- $fullname := include "resourcespace_docker.fullname" . -}} +{{- $tlsname := printf "%s-%s-tls" $fullname "resourcespace" -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/version: master + {{- if .Values.resourcespace.ingress.annotations -}} + {{- toYaml .Values.resourcespace.ingress.annotations | nindent 4 }} + {{- end }} + labels: + {{- include "resourcespace_docker.labels" . | nindent 4 }} + katenary.v3/component: resourcespace + name: '{{ $fullname }}-resourcespace' +spec: + {{- if ne .Values.resourcespace.ingress.class "-" }} + ingressClassName: '{{ tpl .Values.resourcespace.ingress.class $ }}' + {{- end }} + rules: + - host: '{{ tpl .Values.resourcespace.ingress.host $ }}' + http: + paths: + - backend: + service: + name: '{{ $fullname }}-resourcespace' + port: + name: http + path: '{{ tpl .Values.resourcespace.ingress.path $ }}' + pathType: ImplementationSpecific + {{- if .Values.resourcespace.ingress.tls.enabled }} + tls: + - hosts: + - '{{ tpl .Values.resourcespace.ingress.host . }}' + secretName: '{{ .Values.resourcespace.ingress.tls.secretName | default $tlsname }}' + {{ end -}} + +{{- end -}} \ No newline at end of file diff --git a/chart/templates/resourcespace/service.yaml b/chart/templates/resourcespace/service.yaml index 888bbc7..b432d6f 100644 --- a/chart/templates/resourcespace/service.yaml +++ b/chart/templates/resourcespace/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/statics/configmap.yaml b/chart/templates/resourcespace/statics/configmap.yaml index 4fb8499..0c4c073 100644 --- a/chart/templates/resourcespace/statics/configmap.yaml +++ b/chart/templates/resourcespace/statics/configmap.yaml @@ -4,7 +4,7 @@ data: kind: ConfigMap metadata: annotations: - katenary.v3/compose-hash: 7ef9ff871f6607662d992bcbf313e5f61d10ae7a + katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/values.yaml b/chart/values.yaml index 3b81e92..3a3e0ca 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -95,6 +95,34 @@ resourcespace: - ReadWriteOnce # key: resourcespace.persistence.filestore.enabled enabled: true + # Default value for ingress.class annotation + # class: "-" + # If the value is "-", controller will not set ingressClassName + # If the value is "", Ingress will be set to an empty string, so + # controller will use the default value for ingressClass + # If the value is specified, controller will set the named class e.g. "nginx" + # key: resourcespace.ingress + ingress: + # key: resourcespace.ingress.annotations + annotations: {} + # key: resourcespace.ingress.host + host: mywebsite.com (optional) + # key: resourcespace.ingress.path + path: / + # key: resourcespace.ingress.class + class: '-' + # key: resourcespace.ingress.enabled + enabled: false + # Ingress TLS configuration + # If enabled, a secret containing the certificate and the key should be + # created by the ingress controller. If the name if emtpy, so the secret + # name is generated. You can specify the secret name to use your own secret. + # key: resourcespace.ingress.tls + tls: + # key: resourcespace.ingress.tls.enabled + enabled: true + # key: resourcespace.ingress.tls.secretName + secretName: "" # key: resourcespace.replicas replicas: 1 # key: resourcespace.nodeSelector diff --git a/docker-compose.yaml b/docker-compose.yaml index 8ed2a78..e01a096 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,6 +11,9 @@ services: labels: katenary.v3/configmap-files: |- - ./config.php + katenary.v3/ingress: |- + port: 80 + hostname: mywebsite.com (optional) networks: - frontend - backend From 86b6da6aafddc591b8c08736ef3d9e9b9be8f448 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Mon, 24 Nov 2025 16:41:14 -0600 Subject: [PATCH 07/11] 0.1.2 --- chart/Chart.yaml | 8 ++++---- chart/templates/mariadb/configmap.yaml | 2 +- chart/templates/mariadb/deployment.yaml | 2 +- chart/templates/mariadb/mariadb.volumeclaim.yaml | 2 +- chart/templates/mariadb/service.yaml | 2 +- chart/templates/resourcespace/deployment.yaml | 4 ++-- chart/templates/resourcespace/filestore.volumeclaim.yaml | 2 +- chart/templates/resourcespace/ingress.yaml | 2 +- chart/templates/resourcespace/service.yaml | 2 +- chart/templates/resourcespace/statics/configmap.yaml | 2 +- chart/values.yaml | 3 +++ docker-compose.yaml | 1 + 12 files changed, 18 insertions(+), 14 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index c452efe..b21e3a7 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,18 +1,18 @@ # This is the main values.yaml file for the resourcespace_docker chart. # More information can be found in the chart's README.md file. # -# generated at: 2025-11-24T16:22:22-06:00 +# generated at: 2025-11-24T16:40:43-06:00 # compose files: docker-compose.yaml -# compose hash (sha1): 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 +# compose hash (sha1): 130407091ed05d8753a6b9ecc272bb838a11d1ca # Name of the chart (required), basically the name of the project. name: resourcespace_docker apiVersion: v2 # Version of the chart (required) -version: 0.1.1 +version: 0.1.2 # Version of the application (required). # This should be the main application version. -appVersion: 0.1.1 +appVersion: 0.1.2 description: A Helm chart for resourcespace_docker diff --git a/chart/templates/mariadb/configmap.yaml b/chart/templates/mariadb/configmap.yaml index 54fd2e5..ae0d000 100644 --- a/chart/templates/mariadb/configmap.yaml +++ b/chart/templates/mariadb/configmap.yaml @@ -7,7 +7,7 @@ data: kind: ConfigMap metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/deployment.yaml b/chart/templates/mariadb/deployment.yaml index 3bc02a4..4538666 100644 --- a/chart/templates/mariadb/deployment.yaml +++ b/chart/templates/mariadb/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/mariadb.volumeclaim.yaml b/chart/templates/mariadb/mariadb.volumeclaim.yaml index 0e8b03b..21c5936 100644 --- a/chart/templates/mariadb/mariadb.volumeclaim.yaml +++ b/chart/templates/mariadb/mariadb.volumeclaim.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/mariadb/service.yaml b/chart/templates/mariadb/service.yaml index 2445bbb..4f0fac7 100644 --- a/chart/templates/mariadb/service.yaml +++ b/chart/templates/mariadb/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/deployment.yaml b/chart/templates/resourcespace/deployment.yaml index b801058..ba49941 100644 --- a/chart/templates/resourcespace/deployment.yaml +++ b/chart/templates/resourcespace/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} @@ -22,7 +22,7 @@ spec: katenary.v3/component: resourcespace spec: containers: - - image: '{{ tpl .Values.resourcespace.repository.image $ }}:{{ tpl .Values.resourcespace.repository.tag $ | default "latest" }}' + - image: '{{ tpl .Values.resourcespace.repository.image $ }}:{{ tpl .Values.resourcespace.repository.tag $ | default .Chart.AppVersion }}' imagePullPolicy: {{ .Values.resourcespace.imagePullPolicy }} name: resourcespace ports: diff --git a/chart/templates/resourcespace/filestore.volumeclaim.yaml b/chart/templates/resourcespace/filestore.volumeclaim.yaml index 1846392..b033fd1 100644 --- a/chart/templates/resourcespace/filestore.volumeclaim.yaml +++ b/chart/templates/resourcespace/filestore.volumeclaim.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/ingress.yaml b/chart/templates/resourcespace/ingress.yaml index ebbb92a..4958a16 100644 --- a/chart/templates/resourcespace/ingress.yaml +++ b/chart/templates/resourcespace/ingress.yaml @@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master {{- if .Values.resourcespace.ingress.annotations -}} {{- toYaml .Values.resourcespace.ingress.annotations | nindent 4 }} diff --git a/chart/templates/resourcespace/service.yaml b/chart/templates/resourcespace/service.yaml index b432d6f..8517e05 100644 --- a/chart/templates/resourcespace/service.yaml +++ b/chart/templates/resourcespace/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/templates/resourcespace/statics/configmap.yaml b/chart/templates/resourcespace/statics/configmap.yaml index 0c4c073..762f847 100644 --- a/chart/templates/resourcespace/statics/configmap.yaml +++ b/chart/templates/resourcespace/statics/configmap.yaml @@ -4,7 +4,7 @@ data: kind: ConfigMap metadata: annotations: - katenary.v3/compose-hash: 95e4a82d22f5978da3fcb0847f42ab03ac713fb1 + katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: {{- include "resourcespace_docker.labels" . | nindent 4 }} diff --git a/chart/values.yaml b/chart/values.yaml index 3a3e0ca..bde7180 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -76,8 +76,11 @@ resourcespace: repository: # key: resourcespace.repository.image image: "" + # This is the version of the main application. + # Leave it to blank to use the Chart "AppVersion" value. # key: resourcespace.repository.tag tag: "" + # key: resourcespace.persistence persistence: # key: resourcespace.persistence.filestore diff --git a/docker-compose.yaml b/docker-compose.yaml index e01a096..621e71d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,6 +9,7 @@ services: - filestore:/var/www/html/filestore - ./config.php:/var/www/html/include/config.php labels: + katenary.v3/main-app: true katenary.v3/configmap-files: |- - ./config.php katenary.v3/ingress: |- From f64c47bd085d382d11ae04a1d793a1ac81d18cb7 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Wed, 26 Nov 2025 10:34:52 -0600 Subject: [PATCH 08/11] 0.1.3 --- chart/Chart.yaml | 12 ++++++------ chart/README.md | 12 ++++++------ chart/templates/NOTES.txt | 6 +++--- chart/templates/_helpers.tpl | 10 +++++----- chart/templates/mariadb/configmap.yaml | 4 ++-- chart/templates/mariadb/deployment.yaml | 12 ++++++------ chart/templates/mariadb/mariadb.volumeclaim.yaml | 4 ++-- chart/templates/mariadb/service.yaml | 6 +++--- chart/templates/resourcespace/deployment.yaml | 14 +++++++------- .../resourcespace/filestore.volumeclaim.yaml | 4 ++-- chart/templates/resourcespace/ingress.yaml | 4 ++-- chart/templates/resourcespace/service.yaml | 6 +++--- .../templates/resourcespace/statics/configmap.yaml | 4 ++-- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index b21e3a7..d110cac 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,18 +1,18 @@ -# This is the main values.yaml file for the resourcespace_docker chart. +# This is the main values.yaml file for the resourcespace chart. # More information can be found in the chart's README.md file. # -# generated at: 2025-11-24T16:40:43-06:00 +# generated at: 2025-11-26T10:32:40-06:00 # compose files: docker-compose.yaml # compose hash (sha1): 130407091ed05d8753a6b9ecc272bb838a11d1ca # Name of the chart (required), basically the name of the project. -name: resourcespace_docker +name: resourcespace apiVersion: v2 # Version of the chart (required) -version: 0.1.2 +version: 0.1.3 # Version of the application (required). # This should be the main application version. -appVersion: 0.1.2 -description: A Helm chart for resourcespace_docker +appVersion: 0.1.3 +description: A Helm chart for resourcespace diff --git a/chart/README.md b/chart/README.md index a8287e9..ee590c9 100644 --- a/chart/README.md +++ b/chart/README.md @@ -1,6 +1,6 @@ -# resourcespace_docker +# resourcespace -A Helm chart for resourcespace_docker +A Helm chart for resourcespace ## Installing the Chart @@ -8,20 +8,20 @@ To install the chart with the release name `my-release`: ```bash # Standard Helm install -$ helm install my-release resourcespace_docker +$ helm install my-release resourcespace # To use a custom namespace and force the creation of the namespace -$ helm install my-release --namespace my-namespace --create-namespace resourcespace_docker +$ helm install my-release --namespace my-namespace --create-namespace resourcespace # To use a custom values file -$ helm install my-release -f my-values.yaml resourcespace_docker +$ helm install my-release -f my-values.yaml resourcespace ``` See the [Helm documentation](https://helm.sh/docs/intro/using_helm/) for more information on installing and managing the chart. ## Configuration -The following table lists the configurable parameters of the resourcespace_docker chart and their default values. +The following table lists the configurable parameters of the resourcespace chart and their default values. | Parameter | Default | | --------------------------------------------------------- | -------------------------- | diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 1f7c017..ce26270 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -24,12 +24,12 @@ You can see this notes again by running: {{- $count := 0 -}} {{- $listOfURL := "" -}} -{{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} -{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} -{{- end }} {{- if and .Values.resourcespace.ingress .Values.resourcespace.ingress.enabled }} {{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.resourcespace.ingress.host .) -}} {{- end }} +{{- if and .Values.mariadb.ingress .Values.mariadb.ingress.enabled }} +{{- $count = add1 $count -}}{{- $listOfURL = printf "%s\n- http://%s" $listOfURL (tpl .Values.mariadb.ingress.host .) -}} +{{- end }} {{- if gt $count 0 }} # List of activated ingresses URL: diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index ee4977c..3b42cbc 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -1,4 +1,4 @@ -{{- define "resourcespace_docker.fullname" -}} +{{- define "resourcespace.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -11,7 +11,7 @@ {{- end -}} {{- end -}} -{{- define "resourcespace_docker.name" -}} +{{- define "resourcespace.name" -}} {{- if .Values.nameOverride -}} {{- .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -19,8 +19,8 @@ {{- end -}} {{- end -}} -{{- define "resourcespace_docker.labels" -}} -{{ include "resourcespace_docker.selectorLabels" .}} +{{- define "resourcespace.labels" -}} +{{ include "resourcespace.selectorLabels" .}} {{ if .Chart.Version -}} {{ printf "katenary.v3/chart-version: '%s'" .Chart.Version }} {{- end }} @@ -29,7 +29,7 @@ {{- end }} {{- end -}} -{{- define "resourcespace_docker.selectorLabels" -}} +{{- define "resourcespace.selectorLabels" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{ printf "katenary.v3/name: %s" $name }} {{ printf "katenary.v3/instance: %s" .Release.Name }} diff --git a/chart/templates/mariadb/configmap.yaml b/chart/templates/mariadb/configmap.yaml index ae0d000..222efd2 100644 --- a/chart/templates/mariadb/configmap.yaml +++ b/chart/templates/mariadb/configmap.yaml @@ -10,6 +10,6 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: mariadb - name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' + name: '{{ include "resourcespace.fullname" . }}-mariadb' diff --git a/chart/templates/mariadb/deployment.yaml b/chart/templates/mariadb/deployment.yaml index 4538666..7dc25f4 100644 --- a/chart/templates/mariadb/deployment.yaml +++ b/chart/templates/mariadb/deployment.yaml @@ -5,26 +5,26 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: mariadb - name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' + name: '{{ include "resourcespace.fullname" . }}-mariadb' spec: replicas: {{ .Values.mariadb.replicas }} selector: matchLabels: - {{- include "resourcespace_docker.selectorLabels" . | nindent 6 }} + {{- include "resourcespace.selectorLabels" . | nindent 6 }} katenary.v3/component: mariadb strategy: {} template: metadata: labels: - {{- include "resourcespace_docker.selectorLabels" . | nindent 8 }} + {{- include "resourcespace.selectorLabels" . | nindent 8 }} katenary.v3/component: mariadb spec: containers: - envFrom: - configMapRef: - name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' + name: '{{ include "resourcespace.fullname" . }}-mariadb' image: '{{ tpl .Values.mariadb.repository.image $ }}:{{ tpl .Values.mariadb.repository.tag $ | default "latest" }}' imagePullPolicy: {{ .Values.mariadb.imagePullPolicy }} name: mariadb @@ -55,5 +55,5 @@ spec: {{- if .Values.mariadb.persistence.mariadb.enabled }} - name: mariadb persistentVolumeClaim: - claimName: '{{ include "resourcespace_docker.fullname" . }}-mariadb-mariadb' + claimName: '{{ include "resourcespace.fullname" . }}-mariadb-mariadb' {{- end }} diff --git a/chart/templates/mariadb/mariadb.volumeclaim.yaml b/chart/templates/mariadb/mariadb.volumeclaim.yaml index 21c5936..4ccb9ea 100644 --- a/chart/templates/mariadb/mariadb.volumeclaim.yaml +++ b/chart/templates/mariadb/mariadb.volumeclaim.yaml @@ -6,9 +6,9 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: mariadb - name: '{{ include "resourcespace_docker.fullname" . }}-mariadb-mariadb' + name: '{{ include "resourcespace.fullname" . }}-mariadb-mariadb' spec: accessModes: {{- .Values.mariadb.persistence.mariadb.accessMode | toYaml | nindent 2 }} diff --git a/chart/templates/mariadb/service.yaml b/chart/templates/mariadb/service.yaml index 4f0fac7..5e15af1 100644 --- a/chart/templates/mariadb/service.yaml +++ b/chart/templates/mariadb/service.yaml @@ -5,9 +5,9 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: mariadb - name: '{{ include "resourcespace_docker.fullname" . }}-mariadb' + name: '{{ include "resourcespace.fullname" . }}-mariadb' spec: ports: - name: mysql @@ -15,5 +15,5 @@ spec: protocol: TCP targetPort: mysql selector: - {{- include "resourcespace_docker.selectorLabels" . | nindent 4 }} + {{- include "resourcespace.selectorLabels" . | nindent 4 }} katenary.v3/component: mariadb diff --git a/chart/templates/resourcespace/deployment.yaml b/chart/templates/resourcespace/deployment.yaml index ba49941..4a85699 100644 --- a/chart/templates/resourcespace/deployment.yaml +++ b/chart/templates/resourcespace/deployment.yaml @@ -5,20 +5,20 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: resourcespace - name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' + name: '{{ include "resourcespace.fullname" . }}-resourcespace' spec: replicas: {{ .Values.resourcespace.replicas }} selector: matchLabels: - {{- include "resourcespace_docker.selectorLabels" . | nindent 6 }} + {{- include "resourcespace.selectorLabels" . | nindent 6 }} katenary.v3/component: resourcespace strategy: {} template: metadata: labels: - {{- include "resourcespace_docker.selectorLabels" . | nindent 8 }} + {{- include "resourcespace.selectorLabels" . | nindent 8 }} katenary.v3/component: resourcespace spec: containers: @@ -49,7 +49,7 @@ spec: - /bin/sh - -c - |- - until nc -z {{ include "resourcespace_docker.fullname" . }}-mariadb 3306; do + until nc -z {{ include "resourcespace.fullname" . }}-mariadb 3306; do sleep 1; done image: busybox:latest @@ -69,8 +69,8 @@ spec: {{- if .Values.resourcespace.persistence.filestore.enabled }} - name: filestore persistentVolumeClaim: - claimName: '{{ include "resourcespace_docker.fullname" . }}-resourcespace-filestore' + claimName: '{{ include "resourcespace.fullname" . }}-resourcespace-filestore' {{- end }} - configMap: - name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' + name: '{{ include "resourcespace.fullname" . }}-resourcespace' name: config-php diff --git a/chart/templates/resourcespace/filestore.volumeclaim.yaml b/chart/templates/resourcespace/filestore.volumeclaim.yaml index b033fd1..a5dbe10 100644 --- a/chart/templates/resourcespace/filestore.volumeclaim.yaml +++ b/chart/templates/resourcespace/filestore.volumeclaim.yaml @@ -6,9 +6,9 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: resourcespace - name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace-filestore' + name: '{{ include "resourcespace.fullname" . }}-resourcespace-filestore' spec: accessModes: {{- .Values.resourcespace.persistence.filestore.accessMode | toYaml | nindent 2 }} diff --git a/chart/templates/resourcespace/ingress.yaml b/chart/templates/resourcespace/ingress.yaml index 4958a16..1261712 100644 --- a/chart/templates/resourcespace/ingress.yaml +++ b/chart/templates/resourcespace/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.resourcespace.ingress.enabled -}} -{{- $fullname := include "resourcespace_docker.fullname" . -}} +{{- $fullname := include "resourcespace.fullname" . -}} {{- $tlsname := printf "%s-%s-tls" $fullname "resourcespace" -}} apiVersion: networking.k8s.io/v1 kind: Ingress @@ -11,7 +11,7 @@ metadata: {{- toYaml .Values.resourcespace.ingress.annotations | nindent 4 }} {{- end }} labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: resourcespace name: '{{ $fullname }}-resourcespace' spec: diff --git a/chart/templates/resourcespace/service.yaml b/chart/templates/resourcespace/service.yaml index 8517e05..1ea3db8 100644 --- a/chart/templates/resourcespace/service.yaml +++ b/chart/templates/resourcespace/service.yaml @@ -5,9 +5,9 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: resourcespace - name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' + name: '{{ include "resourcespace.fullname" . }}-resourcespace' spec: ports: - name: http @@ -15,5 +15,5 @@ spec: protocol: TCP targetPort: http selector: - {{- include "resourcespace_docker.selectorLabels" . | nindent 4 }} + {{- include "resourcespace.selectorLabels" . | nindent 4 }} katenary.v3/component: resourcespace diff --git a/chart/templates/resourcespace/statics/configmap.yaml b/chart/templates/resourcespace/statics/configmap.yaml index 762f847..642d5eb 100644 --- a/chart/templates/resourcespace/statics/configmap.yaml +++ b/chart/templates/resourcespace/statics/configmap.yaml @@ -7,6 +7,6 @@ metadata: katenary.v3/compose-hash: 130407091ed05d8753a6b9ecc272bb838a11d1ca katenary.v3/version: master labels: - {{- include "resourcespace_docker.labels" . | nindent 4 }} + {{- include "resourcespace.labels" . | nindent 4 }} katenary.v3/component: resourcespace - name: '{{ include "resourcespace_docker.fullname" . }}-resourcespace' + name: '{{ include "resourcespace.fullname" . }}-resourcespace' From cb26f80ea65adda493215b173e5ca495393822b2 Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Wed, 26 Nov 2025 10:41:37 -0600 Subject: [PATCH 09/11] 0.1.4 --- chart/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index d110cac..5c7a7a9 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -10,9 +10,9 @@ name: resourcespace apiVersion: v2 # Version of the chart (required) -version: 0.1.3 +version: 0.1.4 # Version of the application (required). # This should be the main application version. -appVersion: 0.1.3 +appVersion: 0.1.4 description: A Helm chart for resourcespace From 0fa9c7e07c501442375613cdd38350a0afdae6de Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Wed, 26 Nov 2025 11:28:58 -0600 Subject: [PATCH 10/11] image --- chart/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/values.yaml b/chart/values.yaml index bde7180..bb37972 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -75,11 +75,11 @@ resourcespace: # key: resourcespace.repository repository: # key: resourcespace.repository.image - image: "" + image: "ghcr.io/joshuacox/resourcespace_docker/resourcespace" # This is the version of the main application. # Leave it to blank to use the Chart "AppVersion" value. # key: resourcespace.repository.tag - tag: "" + tag: "latest" # key: resourcespace.persistence persistence: @@ -109,7 +109,7 @@ resourcespace: # key: resourcespace.ingress.annotations annotations: {} # key: resourcespace.ingress.host - host: mywebsite.com (optional) + host: resourcespace.example.com # key: resourcespace.ingress.path path: / # key: resourcespace.ingress.class From 815c2f3a5fe85c032a95d7b53d7849d44e8ad6fc Mon Sep 17 00:00:00 2001 From: Joshua Edward McLaughlin Cox Date: Wed, 26 Nov 2025 11:29:18 -0600 Subject: [PATCH 11/11] 0.1.5 --- chart/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 5c7a7a9..ba5f384 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -10,9 +10,9 @@ name: resourcespace apiVersion: v2 # Version of the chart (required) -version: 0.1.4 +version: 0.1.5 # Version of the application (required). # This should be the main application version. -appVersion: 0.1.4 +appVersion: 0.1.5 description: A Helm chart for resourcespace