Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added image registry to radar charts #310

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions charts/_templates.gotmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{ define "common.prerequisites" -}}
## Prerequisites
* Kubernetes 1.22+
* Kubectl 1.22+
* Kubernetes 1.28+
* Kubectl 1.28+
* Helm 3.1.0+
{{- end }}

Expand All @@ -12,4 +12,4 @@

{{ define "common.header" -}}
{{ template "chart.header" . }}[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/{{ template "chart.name" . }})](https://artifacthub.io/packages/helm/radar-base/{{ template "chart.name" . }})
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions charts/app-config-frontend/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: common
repository: https://radar-base.github.io/radar-helm-charts
version: 2.27.0
digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546
generated: "2024-12-26T14:17:51.005521202+01:00"
8 changes: 7 additions & 1 deletion charts/app-config-frontend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2.1.1
version: 2.2.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -41,3 +41,9 @@ maintainers:
- email: [email protected]
name: Nivethika Mahasivam
url: https://www.thehyve.nl/experts/nivethika-mahasivam
dependencies:
- name: common
repository: https://radar-base.github.io/radar-helm-charts
tags:
- bitnami-common
version: 2.x.x
22 changes: 15 additions & 7 deletions charts/app-config-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# app-config-frontend
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config-frontend)](https://artifacthub.io/packages/helm/radar-base/app-config-frontend)

![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)
![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)

A Helm chart for the frontend application of RADAR-base application config (app-config).

Expand All @@ -23,19 +23,27 @@ A Helm chart for the frontend application of RADAR-base application config (app-
* <https://github.com/RADAR-base/radar-app-config>

## Prerequisites
* Kubernetes 1.22+
* Kubectl 1.22+
* Kubernetes 1.28+
* Kubectl 1.28+
* Helm 3.1.0+

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| https://radar-base.github.io/radar-helm-charts | common | 2.x.x |

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| replicaCount | int | `2` | Number of Appconfig frontend replicas to deploy |
| image.repository | string | `"radarbase/radar-app-config-frontend"` | Appconfig frontend image repository |
| image.tag | string | `nil` | Appconfig frontend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
| image.pullPolicy | string | `"IfNotPresent"` | Appconfig frontend image pull policy |
| imagePullSecrets | list | `[]` | Docker registry secret names as an array |
| image.registry | string | `"docker.io"` | Image registry |
| image.repository | string | `"radarbase/radar-app-config-frontend"` | Image repository |
| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName |
| nameOverride | string | `""` | String to partially override app-config-frontend.fullname template with a string (will prepend the release name) |
| fullnameOverride | string | `""` | String to fully override app-config-frontend.fullname template with a string |
| podAnnotations | object | `{}` | Annotations for Appconfig frontend pods |
Expand Down
Binary file not shown.
14 changes: 14 additions & 0 deletions charts/app-config-frontend/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ Expand the name of the chart.
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Return the proper image name
*/}}
{{- define "app-config-frontend.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }}
{{- end -}}

{{/*
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "app-config-frontend.imagePullSecrets" -}}
{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
{{- 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).
Expand Down
18 changes: 9 additions & 9 deletions charts/app-config-frontend/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "app-config-frontend.fullname" . }}
labels:
{{- include "app-config-frontend.labels" . | nindent 4 }}
name: {{ template "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand All @@ -18,10 +21,7 @@ spec:
labels:
{{- include "app-config-frontend.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- include "app-config-frontend.imagePullSecrets" . | nindent 6 }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
affinity:
Expand All @@ -44,8 +44,8 @@ spec:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
image: {{ template "app-config-frontend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: BASE_HREF
value: /appconfig/
Expand Down
25 changes: 8 additions & 17 deletions charts/app-config-frontend/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "app-config-frontend.fullname" . -}}
{{- $path := .Values.ingress.path -}}
{{- $hosts := .Values.ingress.hosts -}}
{{- $svcPort := .Values.service.port -}}
Expand All @@ -11,13 +10,14 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{ include "app-config-frontend.labels" . | indent 4 }}
{{- with .Values.ingress.annotations }}
name: {{ include "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if or .Values.ingress.annotations .Values.commonAnnotations }}
{{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }}
{{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
{{- if and .Values.ingress.tls (not .Values.disable_tls) }}
Expand All @@ -37,15 +37,6 @@ spec:
{{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ $pathType }}
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- end }}
9 changes: 6 additions & 3 deletions charts/app-config-frontend/templates/networkpolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
kind: NetworkPolicy
apiVersion: networking.k8s.io/v1
metadata:
name: {{ template "app-config-frontend.fullname" . }}
labels:
{{ include "app-config-frontend.labels" . | indent 4 }}
name: {{ template "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
podSelector:
matchLabels:
Expand Down
13 changes: 8 additions & 5 deletions charts/app-config-frontend/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "app-config-frontend.fullname" . }}
labels:
{{- include "app-config-frontend.labels" . | nindent 4 }}
name: {{ template "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
protocol: TCP
name: http
selector:
{{- include "app-config-frontend.selectorLabels" . | nindent 4 }}
{{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}
selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
20 changes: 14 additions & 6 deletions charts/app-config-frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,24 @@
replicaCount: 2

image:
# -- Appconfig frontend image repository
# -- Image registry
registry: docker.io
# -- Image repository
repository: radarbase/radar-app-config-frontend
# -- Appconfig frontend image tag (immutable tags are recommended)
# -- Image tag (immutable tags are recommended)
# Overrides the image tag whose default is the chart appVersion.
tag:
# -- Appconfig frontend image pull policy
# -- Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag
digest: ""
# -- Image pull policy
pullPolicy: IfNotPresent

# -- Docker registry secret names as an array
imagePullSecrets: []
# -- Optionally specify an array of imagePullSecrets.
# Secrets must be manually created in the namespace.
# e.g:
# pullSecrets:
# - myRegistryKeySecretName
#
pullSecrets: []

# -- String to partially override app-config-frontend.fullname template with a string (will prepend the release name)
nameOverride: ""
Expand Down
6 changes: 6 additions & 0 deletions charts/app-config/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: common
repository: https://radar-base.github.io/radar-helm-charts
version: 2.27.0
digest: sha256:397fd12e07f1aa1a5280579406a75b169f8262ac4214584ea366460277288546
generated: "2024-12-26T13:39:04.017625795+01:00"
8 changes: 7 additions & 1 deletion charts/app-config/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "0.5.2"
description: A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
name: app-config
version: 1.3.4
version: 1.4.0
icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
sources:
- https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/app-config
Expand All @@ -24,3 +24,9 @@ maintainers:
- email: [email protected]
name: Nivethika Mahasivam
url: https://www.thehyve.nl/experts/nivethika-mahasivam
dependencies:
- name: common
repository: https://radar-base.github.io/radar-helm-charts
tags:
- bitnami-common
version: 2.x.x
22 changes: 15 additions & 7 deletions charts/app-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# app-config
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config)](https://artifacthub.io/packages/helm/radar-base/app-config)

![Version: 1.3.4](https://img.shields.io/badge/Version-1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)
![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)

A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.

Expand All @@ -23,19 +23,27 @@ A Helm chart for RADAR-base application config (app-config) backend service whic
* <https://github.com/RADAR-base/radar-app-config>

## Prerequisites
* Kubernetes 1.22+
* Kubectl 1.22+
* Kubernetes 1.28+
* Kubectl 1.28+
* Helm 3.1.0+

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| https://radar-base.github.io/radar-helm-charts | common | 2.x.x |

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| replicaCount | int | `2` | Number of Appconfig replicas to deploy |
| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repositorys |
| image.tag | string | `nil` | Appconfig image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
| image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy |
| imagePullSecrets | list | `[]` | Docker registry secret names as an array |
| image.registry | string | `"docker.io"` | Image registry |
| image.repository | string | `"radarbase/radar-app-config"` | Image repository |
| image.tag | string | `nil` | Image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
| image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets: - myRegistryKeySecretName |
| nameOverride | string | `""` | String to partially override appconfig.fullname template with a string (will prepend the release name) |
| fullnameOverride | string | `""` | String to fully override appconfig.fullname template with a string |
| namespace | string | `"default"` | Kubernetes namespace that Appconfig is going to be deployed on |
Expand Down
Binary file added charts/app-config/charts/common-2.27.0.tgz
Binary file not shown.
14 changes: 14 additions & 0 deletions charts/app-config/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ Expand the name of the chart.
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Return the proper image name
*/}}
{{- define "app-config.image" -}}
{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }}
{{- end -}}

{{/*
Return the proper Docker Image Registry Secret Names
*/}}
{{- define "app-config.imagePullSecrets" -}}
{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
{{- 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).
Expand Down
12 changes: 6 additions & 6 deletions charts/app-config/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "app-config.fullname" . }}
labels:
app: {{ template "app-config.name" . }}
chart: {{ template "app-config.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
name: {{ template "common.names.fullname" . }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
healthcheck.sh: |
#!/bin/sh
Expand Down
Loading
Loading