Skip to content

Commit

Permalink
Fix for podAnnotations (#22)
Browse files Browse the repository at this point in the history
Pod Annotations need to be quoted in
case of special characters and need to
be consistently applied. Support is
added for global pod annotations and
deployment specific annotations.

Fixes #21
  • Loading branch information
rvowles authored Dec 16, 2023
1 parent cded88d commit 79feb55
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 7 deletions.
4 changes: 2 additions & 2 deletions helm/featurehub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ description: "FeatueHub is an Enterprise Grade, Cloud Native Feature Management
NATS or Google PubSub as a streaming layer. Kinesis is available but has limited testing. Documentation on configuration is provided on [Featurehub Docs](https://docs.featurehub.io/featurehub/latest/configuration.html)
NATS and Postgres are *NOT* requirements of the project and are included only for evaluation convenience and evaluation. It is expected people will install
NATS and Postgres are *NOT* requirements of the project and are included only for convenience and evaluation. It is expected people will install
their own requirements.
"
type: application
version: 4.1.0
version: 4.1.1
icon: https://raw.githubusercontent.com/featurehub-io/featurehub/main/docs/modules/ROOT/images/fh_icon.png
appVersion: "1.7.0"
maintainers:
Expand Down
5 changes: 3 additions & 2 deletions helm/featurehub/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# featurehub

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

FeatueHub is an Enterprise Grade, Cloud Native Feature Management platform that is available to suite any organisations requirements. This fully supported Helm chart is the Open Source version of the product, which has all the same features as the [SaaS product](https://app.featurehub.io).

The project is hosted on [Github](https://github.com/featurehub-io/featurehub). It supports Postgres, MySQL, MariaDB or Oracle Database deployments, and uses NATS or Google PubSub as a streaming layer. Kinesis is available but has limited testing. Documentation on configuration is provided on [Featurehub Docs](https://docs.featurehub.io/featurehub/latest/configuration.html)

NATS and Postgres are *NOT* requirements of the project and are included only for evaluation convenience and evaluation. It is expected people will install their own requirements.
NATS and Postgres are *NOT* requirements of the project and are included only for convenience and evaluation. It is expected people will install their own requirements.

## Maintainers

Expand Down Expand Up @@ -172,6 +172,7 @@ NATS and Postgres are *NOT* requirements of the project and are included only fo
| managementRepository.tolerations | list | `[]` | |
| nameOverride | string | `""` | |
| nats | object | `{"cluster":{"enabled":true,"name":"featurehub","replicas":3},"enabled":true,"topologyKeys":[]}` | ----------------------------------------------------------------------------- # |
| podAnnotations | object | `{}` | |
| postgresql | object | `{"enabled":true,"global":{"postgresql":{"auth":{"postgresPassword":"postgresql"}}},"primary":{"initdb":{"scripts":{"featurehub.sql":"CREATE USER featurehub PASSWORD 'featurehub' LOGIN;\nCREATE DATABASE featurehub;\nGRANT ALL PRIVILEGES ON DATABASE featurehub TO featurehub;\n\\connect featurehub\nGRANT ALL ON SCHEMA public TO featurehub;"}},"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"128Mi","storageClassName":"standard"}}}` | ----------------------------------------------------------------------------- # |

----------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion helm/featurehub/templates/dacha/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ spec:
{{- end }}

{{- range $key, $value := .Values.dacha.podAnnotations }}
{{ $key }}: {{ $value}}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.podAnnotations }}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
labels:
{{- include "featurehub.dacha.selectorLabels" . | nindent 8 }}
Expand Down
5 changes: 4 additions & 1 deletion helm/featurehub/templates/edge/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ spec:
checksum/global-common-config-extra: {{ include (print $.Template.BasePath "/common/configmap-global-common-config-extra.yaml") . | sha256sum }}
{{- end }}

{{- range $key, $value := .Values.edge.podAnnotations }}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.podAnnotations }}
{{ $key }}: {{ $value}}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
labels:
{{- include "featurehub.edge.selectorLabels" . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ spec:
checksum/global-common-config-extra: {{ include (print $.Template.BasePath "/common/configmap-global-common-config-extra.yaml") . | sha256sum }}
{{- end }}

{{- range $key, $value := .Values.managementRepository.podAnnotations }}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.podAnnotations }}
{{ $key }}: {{ $value}}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
labels:
{{- include "featurehub.managementRepository.selectorLabels" . | nindent 8 }}
Expand Down
2 changes: 2 additions & 0 deletions helm/featurehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

nameOverride: ""
fullnameOverride: ""
podAnnotations: {}


# global sections are normally reserved for cross application configuration, where multiple apps are in the repository,
# we should generally not use this section
Expand Down

0 comments on commit 79feb55

Please sign in to comment.