diff --git a/.github/workflows/helm-publish.yml b/.github/workflows/helm-publish.yml index 590ef3f..420651e 100644 --- a/.github/workflows/helm-publish.yml +++ b/.github/workflows/helm-publish.yml @@ -47,5 +47,5 @@ jobs: if [ -z "${pkg:-}" ]; then break fi - helm push "${pkg}" "oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/helm-charts" + helm push "${pkg}" "oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts-gs" done diff --git a/README.md b/README.md index 6af4f5e..40cb01b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,16 @@ -# WARNING: New location storage for the helm chart +# How to publish a new version of an helm chart + +1. Make your changes +2. Change the version in the Chart.yaml +3. Push your code + +# How to create a new helm chart + +1. Create a new folder with the name of your helm chart +2. Do your changes inside the folder +3. Push your code + +# WARNING: New location storage for the helm chart - How to use All the helm chart are now stored inside the GitHub Docker registry. diff --git a/acceptance-tests/Chart.yaml b/acceptance-tests/Chart.yaml index 0531189..ba6efd3 100644 --- a/acceptance-tests/Chart.yaml +++ b/acceptance-tests/Chart.yaml @@ -15,7 +15,7 @@ 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.2.0 +version: 0.3.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 diff --git a/apache-mod-mellon/Chart.yaml b/apache-mod-mellon/Chart.yaml index 8afd16e..b4271a0 100644 --- a/apache-mod-mellon/Chart.yaml +++ b/apache-mod-mellon/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: apache-mod-mellon description: A Helm chart for deploying an Apache HTTPd configured with the mod_mellon type: application -version: 1.2.1 +version: 1.3.0 appVersion: "1.16.0" diff --git a/apache-nas/Chart.yaml b/apache-nas/Chart.yaml index d352bfd..89c14a7 100644 --- a/apache-nas/Chart.yaml +++ b/apache-nas/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: apache-nas description: A Helm chart for deploying a Apache-httpd server type: application -version: 1.0.0 +version: 1.1.0 appVersion: "1.16.0" diff --git a/cadastrapp/Chart.yaml b/cadastrapp/Chart.yaml index 777f6e4..7f151af 100644 --- a/cadastrapp/Chart.yaml +++ b/cadastrapp/Chart.yaml @@ -4,7 +4,7 @@ description: A Helm chart for deploying geOrchestra's cadastrapp type: application -version: 1.0.0 +version: 1.1.0 # Last version released on https://github.com/georchestra/cadastrapp is 2.0 appVersion: "2.0.0" diff --git a/datahub/.helmignore b/datahub/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/datahub/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/datahub/Chart.yaml b/datahub/Chart.yaml deleted file mode 100644 index 1675fe4..0000000 --- a/datahub/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: datahub -description: A Helm chart to deploy the datahub application -type: application -version: 0.3.0 -appVersion: "1.16.0" diff --git a/datahub/README.md b/datahub/README.md deleted file mode 100644 index a16cbf9..0000000 --- a/datahub/README.md +++ /dev/null @@ -1 +0,0 @@ -# This repo has moved to https://github.com/geonetwork/geonetwork-helm-charts/tree/main/datahub diff --git a/datahub/templates/_bootstrap-datahub-configuration.tpl b/datahub/templates/_bootstrap-datahub-configuration.tpl deleted file mode 100644 index 31d748b..0000000 --- a/datahub/templates/_bootstrap-datahub-configuration.tpl +++ /dev/null @@ -1,27 +0,0 @@ -{{- define "datahub.bootstrap_datahub_configuration" -}} -- name: bootstrap-datahub-configuration - image: bitnami/git - command: - - /bin/sh - - -c - - {{- if .Values.configuration.git.ssh_secret }} - mkdir -p /root/.ssh ; - cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ; - chmod 0600 /root/.ssh/id_rsa ; - {{- end }} - if [ ! -f /etc/datahub/default.properties ] ; then - git clone --depth 1 --single-branch {{ .Values.configuration.git.url }} -b {{ .Values.configuration.git.ref }} /etc/datahub ; - fi ; - {{- if .Values.configuration.git.ssh_secret }} - env: - - name: GIT_SSH_COMMAND - value: ssh -o "IdentitiesOnly=yes" -o "StrictHostKeyChecking no" - {{- end }} - volumeMounts: - - mountPath: /etc/datahub - name: datahub-configuration - {{- if .Values.configuration.git.ssh_secret }} - - mountPath: /ssh-secret - name: ssh-secret - {{- end }} -{{- end -}} diff --git a/datahub/templates/_helpers.tpl b/datahub/templates/_helpers.tpl deleted file mode 100644 index 7faafa2..0000000 --- a/datahub/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "helm-datahub.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "helm-datahub.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 }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "helm-datahub.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "helm-datahub.labels" -}} -helm.sh/chart: {{ include "helm-datahub.chart" . }} -{{ include "helm-datahub.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "helm-datahub.selectorLabels" -}} -app.kubernetes.io/name: {{ include "helm-datahub.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "helm-datahub.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "helm-datahub.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/datahub/templates/datahub-deployment.yaml b/datahub/templates/datahub-deployment.yaml deleted file mode 100644 index 6cc39ef..0000000 --- a/datahub/templates/datahub-deployment.yaml +++ /dev/null @@ -1,87 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "helm-datahub.fullname" . }}-datahub-deployment - labels: - {{- include "helm-datahub.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - {{- include "helm-datahub.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "helm-datahub.selectorLabels" . | nindent 8 }} - org.geonetwork.service/name: {{ include "helm-datahub.fullname" . }}-datahub-deployment - spec: - {{- if .Values.configuration.git.url }} - initContainers: - {{- include "datahub.bootstrap_datahub_configuration" $ | nindent 6 }} - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - {{- with .Values.lifecycle }} - lifecycle: - {{- toYaml . | nindent 12 }} - {{- end }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - env: - - name: CONFIG_DIRECTORY_OVERRIDE - value: "/etc/datahub/{{ .Values.configuration.override_directories.config_directory_override }}" - - name: ASSETS_DIRECTORY_OVERRIDE - value: "/etc/datahub/{{ .Values.configuration.override_directories.assets_directory_override }}" - {{- with .Values.extra_environment }} - {{- toYaml . | nindent 12 }} - {{- end }} - volumeMounts: - - name: datahub-configuration - mountPath: /etc/datahub - volumes: - - name: datahub-configuration - emptyDir: {} - {{- if .Values.configuration.git.ssh_secret }} - - name: ssh-secret - secret: - secretName: {{ .Values.configuration.git.ssh_secret }} - defaultMode: 0400 - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/datahub/templates/datahub-svc.yaml b/datahub/templates/datahub-svc.yaml deleted file mode 100644 index 1f4f071..0000000 --- a/datahub/templates/datahub-svc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "helm-datahub.fullname" . }}-datahub-svc - labels: - {{- include "helm-datahub.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - org.geonetwork.service/name: {{ include "helm-datahub.fullname" . }}-datahub-deployment diff --git a/datahub/templates/tests/test-connection.yaml b/datahub/templates/tests/test-connection.yaml deleted file mode 100644 index 3822ee2..0000000 --- a/datahub/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "helm-datahub.fullname" . }}-test-connection" - labels: - {{- include "helm-datahub.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "helm-datahub.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/datahub/values.yaml b/datahub/values.yaml deleted file mode 100644 index 7537d65..0000000 --- a/datahub/values.yaml +++ /dev/null @@ -1,61 +0,0 @@ -replicaCount: 1 - -image: - repository: geonetwork/geonetwork-ui-datahub - tag: master - pullPolicy: Always - -configuration: - # The directory name is the directory from the root of the git repository - # If the datahub config is located in the /conf directory then write conf - # in config_directory_override. - override_directories: - config_directory_override: "conf" - assets_directory_override: "assets" - git: - url: {} - ref: {} - ssh_secret: {} - -extra_environment: [] - # - name: GN4_API_URL - # value: "https://gn4.custom/geonetwork/srv/api" - -podAnnotations: {} - -podSecurityContext: {} - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -#lifecycle: -# postStart: -# exec: -# command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"] -# preStop: -# exec: -# command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"] - -resources: - limits: - cpu: 100m - memory: 128Mi - requests: - cpu: 100m - memory: 128Mi - - -nodeSelector: {} - -tolerations: [] - -affinity: {} \ No newline at end of file diff --git a/geocontrib/Chart.yaml b/geocontrib/Chart.yaml index 1b2186a..c3a905b 100644 --- a/geocontrib/Chart.yaml +++ b/geocontrib/Chart.yaml @@ -4,5 +4,5 @@ description: | A Helm chart for deploying geocontrib (https://github.com/neogeo-technologies/geocontrib) type: application -version: 1.0.0 +version: 1.1.0 appVersion: "5.0.2" diff --git a/georchestra-backup-ldap/Chart.yaml b/georchestra-backup-ldap/Chart.yaml index 866f1ed..3ab74d0 100644 --- a/georchestra-backup-ldap/Chart.yaml +++ b/georchestra-backup-ldap/Chart.yaml @@ -15,7 +15,7 @@ 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: 1.0.0 +version: 1.1.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 diff --git a/geoserver-datadir-sync/Chart.yaml b/geoserver-datadir-sync/Chart.yaml index 74f97e4..30bb127 100644 --- a/geoserver-datadir-sync/Chart.yaml +++ b/geoserver-datadir-sync/Chart.yaml @@ -15,7 +15,7 @@ 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: 1.0.0 +version: 1.1.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 diff --git a/geoserver-lb/Chart.yaml b/geoserver-lb/Chart.yaml index 3b28def..2ddec04 100644 --- a/geoserver-lb/Chart.yaml +++ b/geoserver-lb/Chart.yaml @@ -2,5 +2,5 @@ name: geoserver-lb apiVersion: v2 description: A Helm chart for deploying geoserver loadbalanced type: application -version: 1.1.0 +version: 1.2.0 appVersion: "22.0.4" diff --git a/mviewer/.helmignore b/mviewer/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/mviewer/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/mviewer/Chart.yaml b/mviewer/Chart.yaml deleted file mode 100644 index e67fcb7..0000000 --- a/mviewer/Chart.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v2 -name: mviewer -description: A Helm chart to deploy the mviewer stack -type: application -version: 0.2.12 -appVersion: "3.9" -maintainers: - - name: geOrchestra - url: https://www.georchestra.org diff --git a/mviewer/README.md b/mviewer/README.md deleted file mode 100644 index 1e6ad73..0000000 --- a/mviewer/README.md +++ /dev/null @@ -1 +0,0 @@ -MOVED TO https://github.com/mviewer/helm-charts/tree/main/mviewer \ No newline at end of file diff --git a/mviewer/templates/_bootstrap-mviewer-configuration.tpl b/mviewer/templates/_bootstrap-mviewer-configuration.tpl deleted file mode 100644 index 039df9b..0000000 --- a/mviewer/templates/_bootstrap-mviewer-configuration.tpl +++ /dev/null @@ -1,26 +0,0 @@ -{{- define "mviewer.bootstrap_mviewer_configuration" -}} -- name: bootstrap-mviewer-configuration - image: bitnami/git - command: - - /bin/sh - - -c - - {{- if .Values.configuration.git.ssh_secret }} - mkdir -p /root/.ssh ; - cp /ssh-secret/ssh-privatekey /root/.ssh/id_rsa ; - chmod 0600 /root/.ssh/id_rsa ; - {{- end }} - rm -Rf /usr/share/nginx/html/apps ; - git clone --depth 1 --single-branch {{ .Values.configuration.git.url }} -b {{ .Values.configuration.git.ref }} /usr/share/nginx/html/apps ; - {{- if .Values.configuration.git.ssh_secret }} - env: - - name: GIT_SSH_COMMAND - value: ssh -o "IdentitiesOnly=yes" -o "StrictHostKeyChecking no" - {{- end }} - volumeMounts: - - mountPath: /usr/share/nginx/html/apps - name: mviewer-configuration - {{- if .Values.configuration.git.ssh_secret }} - - mountPath: /ssh-secret - name: ssh-secret - {{- end }} -{{- end -}} diff --git a/mviewer/templates/_helpers.tpl b/mviewer/templates/_helpers.tpl deleted file mode 100644 index fda6fad..0000000 --- a/mviewer/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "helm-mviewer.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "helm-mviewer.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 }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "helm-mviewer.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "helm-mviewer.labels" -}} -helm.sh/chart: {{ include "helm-mviewer.chart" . }} -{{ include "helm-mviewer.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "helm-mviewer.selectorLabels" -}} -app.kubernetes.io/name: {{ include "helm-mviewer.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "helm-mviewer.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "helm-mviewer.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/mviewer/templates/ingress.yaml b/mviewer/templates/ingress.yaml deleted file mode 100644 index d5be8d7..0000000 --- a/mviewer/templates/ingress.yaml +++ /dev/null @@ -1,76 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "helm-mviewer.fullname" . -}} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} - -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "helm-mviewer.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts | default (list "") }} - {{- if $.Values.ingress.hosts }} - - host: {{ .host | quote }} - {{- else }} - - host: {{ $.Values.fqdn | quote }} - {{- end }} - http: - paths: - {{- if $.Values.mviewer.enabled }} - - path: / - {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} - pathType: Prefix - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ include "helm-mviewer.fullname" $ }}-mviewer-svc - port: - number: 80 - {{- else }} - serviceName: {{ include "helm-mviewer.fullname" $ }}-mviewer-svc - servicePort: 80 - {{- end }} - {{- end }} - {{- if $.Values.mviewerstudio.enabled }} - - path: /mviewerstudio - {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} - pathType: Prefix - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ include "helm-mviewer.fullname" $ }}-mviewerstudio-svc - port: - number: 8000 - {{- else }} - serviceName: {{ include "helm-mviewer.fullname" $ }}-mviewerstudio-svc - servicePort: 8000 - {{- end }} - {{- end }} - {{- end }} - {{- end }} diff --git a/mviewer/templates/mviewer-deployment.yaml b/mviewer/templates/mviewer-deployment.yaml deleted file mode 100644 index 925921c..0000000 --- a/mviewer/templates/mviewer-deployment.yaml +++ /dev/null @@ -1,95 +0,0 @@ -{{- if .Values.mviewer.enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "helm-mviewer.fullname" . }}-mviewer-deployment - labels: - {{- include "helm-mviewer.labels" . | nindent 4 }} - application/name: {{ include "helm-mviewer.fullname" . }}-mviewer-deployment -spec: - replicas: {{ .Values.mviewer.replicaCount }} - selector: - matchLabels: - {{- include "helm-mviewer.selectorLabels" . | nindent 6 }}-mviewer - application/name: {{ include "helm-mviewer.fullname" . }}-mviewer-deployment - template: - metadata: - {{- with .Values.mviewer.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "helm-mviewer.selectorLabels" . | nindent 8 }}-mviewer - application/name: {{ include "helm-mviewer.fullname" . }}-mviewer-deployment - spec: - {{- if .Values.mviewer.configuration.git.url }} - initContainers: - {{- include "mviewer.bootstrap_mviewer_configuration" $ | nindent 6 }} - {{- end }} - {{- with .Values.mviewer.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.mviewer.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.mviewer.securityContext | nindent 12 }} - image: "{{ .Values.mviewer.image.repository }}:{{ .Values.mviewer.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.mviewer.image.pullPolicy }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - {{- with .Values.mviewer.lifecycle }} - lifecycle: - {{- toYaml . | nindent 12 }} - {{- end }} - resources: - {{- toYaml .Values.mviewer.resources | nindent 12 }} - {{- with .Values.mviewer.extra_environment }} - env: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.mviewer.configuration.git.url }} - volumeMounts: - - name: mviewer-configuration - mountPath: /usr/share/nginx/html/apps - {{- else if .Values.mviewer.extraVolumeMounts }} - volumeMounts: - {{- .Values.mviewer.extraVolumeMounts | toYaml | nindent 10 }} - {{- end }} - {{- if .Values.mviewer.configuration.git.url }} - volumes: - - name: mviewer-configuration - emptyDir: {} - - name: ssh-secret - secret: - secretName: {{ .Values.mviewer.configuration.git.ssh_secret }} - defaultMode: 0400 - {{- else if .Values.mviewer.extraVolumes }} - volumes: - {{- .Values.mviewer.extraVolumes | toYaml | nindent 6 }} - {{- end }} - {{- with .Values.mviewer.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.mviewer.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.mviewer.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/mviewer/templates/mviewer-svc.yaml b/mviewer/templates/mviewer-svc.yaml deleted file mode 100644 index e2b24a9..0000000 --- a/mviewer/templates/mviewer-svc.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.mviewer.enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "helm-mviewer.fullname" . }}-mviewer-svc - labels: - {{- include "helm-mviewer.labels" . | nindent 4 }} -spec: - type: {{ .Values.mviewer.service.type }} - ports: - - port: {{ .Values.mviewer.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - application/name: {{ include "helm-mviewer.fullname" . }}-mviewer-deployment -{{- end }} diff --git a/mviewer/templates/mviewerstudio-deployment.yaml b/mviewer/templates/mviewerstudio-deployment.yaml deleted file mode 100644 index 48ecd4b..0000000 --- a/mviewer/templates/mviewerstudio-deployment.yaml +++ /dev/null @@ -1,79 +0,0 @@ -{{- if .Values.mviewerstudio.enabled -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-deployment - labels: - {{- include "helm-mviewer.labels" . | nindent 4 }} - application/name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-deployment -spec: - replicas: {{ .Values.mviewerstudio.replicaCount }} - selector: - matchLabels: - {{- include "helm-mviewer.selectorLabels" . | nindent 6 }}-mviewerstudio - application/name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-deployment - template: - metadata: - {{- with .Values.mviewerstudio.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "helm-mviewer.selectorLabels" . | nindent 8 }}-mviewerstudio - application/name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-deployment - spec: - {{- with .Values.mviewerstudio.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.mviewerstudio.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.mviewerstudio.securityContext | nindent 12 }} - image: "{{ .Values.mviewerstudio.image.repository }}:{{ .Values.mviewerstudio.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.mviewerstudio.image.pullPolicy }} - ports: - - name: http - containerPort: 8000 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - {{- with .Values.mviewerstudio.lifecycle }} - lifecycle: - {{- toYaml . | nindent 12 }} - {{- end }} - resources: - {{- toYaml .Values.mviewerstudio.resources | nindent 12 }} - {{- with .Values.mviewerstudio.extra_environment }} - env: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.mviewerstudio.extraVolumeMounts }} - volumeMounts: - {{- .Values.mviewerstudio.extraVolumeMounts | toYaml | nindent 10 }} - {{- end }} - {{- if .Values.mviewerstudio.extraVolumes }} - volumes: - {{- .Values.mviewerstudio.extraVolumes | toYaml | nindent 6 }} - {{- end }} - {{- with .Values.mviewerstudio.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.mviewerstudio.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.mviewerstudio.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} -{{- end }} diff --git a/mviewer/templates/mviewerstudio-svc.yaml b/mviewer/templates/mviewerstudio-svc.yaml deleted file mode 100644 index 8d420de..0000000 --- a/mviewer/templates/mviewerstudio-svc.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.mviewerstudio.enabled -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-svc - labels: - {{- include "helm-mviewer.labels" . | nindent 4 }} -spec: - type: {{ .Values.mviewerstudio.service.type }} - ports: - - port: {{ .Values.mviewerstudio.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - application/name: {{ include "helm-mviewer.fullname" . }}-mviewerstudio-deployment -{{- end }} diff --git a/mviewer/values.yaml b/mviewer/values.yaml deleted file mode 100644 index 1c9ced6..0000000 --- a/mviewer/values.yaml +++ /dev/null @@ -1,145 +0,0 @@ -mviewer: - enabled: true - replicaCount: 1 - - image: - repository: mviewer/mviewer - tag: latest - pullPolicy: Always - - configuration: - git: - url: {} - ref: {} - ssh_secret: {} - - extra_environment: [] - # - name: MY_ENV - # value: myvalue - - podAnnotations: {} - - podSecurityContext: {} - - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - - service: - type: ClusterIP - port: 80 - annotations: {} - - #lifecycle: - # postStart: - # exec: - # command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"] - # preStop: - # exec: - # command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"] - - resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - nodeSelector: {} - - tolerations: [] - - affinity: {} - - extraVolumeMounts: [] - # - mountPath: /usr/share/nginx/html - # name: volume-pvc - - extraVolumes: [] - # - name: volume-pvc - # persistentVolumeClaim: - # claimName: persitent-volume-claim - -mviewerstudio: - enabled: false - replicaCount: 1 - - image: - repository: mviewer/mviewerstudio - tag: python-latest - pullPolicy: Always - - extra_environment: [] - # - name: MY_ENV - # value: myvalue - - podAnnotations: {} - - podSecurityContext: {} - - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - - service: - type: ClusterIP - port: 8000 - annotations: {} - - #lifecycle: - # postStart: - # exec: - # command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"] - # preStop: - # exec: - # command: ["/bin/sh","-c","nginx -s quit; while killall -0 nginx; do sleep 1; done"] - - resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - nodeSelector: {} - - tolerations: [] - - affinity: {} - - extraVolumeMounts: [] - # - mountPath: /usr/share/nginx/html - # name: volume-pvc - - extraVolumes: [] - # - name: volume-pvc - # persistentVolumeClaim: - # claimName: persitent-volume-claim - -ingress: - enabled: true - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: mviewer.mydomain.org - tls: [] - # You can import TLS secrets using - # kubectl create secret tls testsecret --key key.pem --cert cert.pem - # Then specify the TLS secret name below. - # - secretName: testsecret - # hosts: - # - mviewer.mydomain.org - # define a custom incressClassName, like "traefik" or "nginx" - className: "" - diff --git a/opendata-ogc-features/Chart.yaml b/opendata-ogc-features/Chart.yaml index c7b5c7e..2e68191 100644 --- a/opendata-ogc-features/Chart.yaml +++ b/opendata-ogc-features/Chart.yaml @@ -4,6 +4,6 @@ description: Helm chart for data-api (opendata-ogc-features) type: application -version: 1.0.0 +version: 1.1.0 appVersion: "1.0.0" diff --git a/pgbouncer/Chart.yaml b/pgbouncer/Chart.yaml index 5e0c30e..5844c25 100644 --- a/pgbouncer/Chart.yaml +++ b/pgbouncer/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.18.0" description: A Helm chart installing pgbouncer in kubernetes name: pgbouncer -version: 1.8.0 +version: 1.9.0 diff --git a/sdi-consistence-check/Chart.yaml b/sdi-consistence-check/Chart.yaml index 30f08ce..2cab7db 100644 --- a/sdi-consistence-check/Chart.yaml +++ b/sdi-consistence-check/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart sdi-consistency-check cronjob name: sdi-consistence-check -version: 1.0.0 +version: 1.1.0 diff --git a/sftp/Chart.yaml b/sftp/Chart.yaml index 5b9460b..5154ebd 100644 --- a/sftp/Chart.yaml +++ b/sftp/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for deploying a SFTP stack type: application -version: 1.2.0 +version: 1.3.0 appVersion: "1.0" diff --git a/vrt-bot/Chart.yaml b/vrt-bot/Chart.yaml index 7f46f2a..182dd9d 100644 --- a/vrt-bot/Chart.yaml +++ b/vrt-bot/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: vrt-bot description: A Helm chart for deploying vrt-bot type: application -version: 1.0.0 +version: 1.1.0 appVersion: "0.0.1"