Skip to content

Commit

Permalink
Merge branch 'main' into add-ruby-support
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaspoignant authored Aug 13, 2024
2 parents 79c3c6b + 1eea77e commit 543b4f0
Show file tree
Hide file tree
Showing 143 changed files with 565 additions and 486 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ jobs:
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}

- name: yq - portable yaml processor
uses: mikefarah/[email protected].2
uses: mikefarah/[email protected].3

- name: Bump chart appVersion
working-directory: ./release/
Expand Down
18 changes: 18 additions & 0 deletions cmd/relayproxy/helm-charts/relay-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,24 @@ object
Environment variables to pass to the relay proxy
</td>
</tr>
<tr>
<td id="extraManifests">
<a href="./values.yaml#L125">extraManifests</a>
</td>
<td>
list
</td>
<td>
<div style="max-width: 300px;">
<pre lang="json">
[]
</pre>
</div>
</td>
<td>
Array of extra objects to deploy with the release (evaluated as a template)
</td>
</tr>
<tr>
<td id="fullnameOverride">
<a href="./values.yaml#L42">fullnameOverride</a>
Expand Down
14 changes: 14 additions & 0 deletions cmd/relayproxy/helm-charts/relay-proxy/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,17 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
Renders a value that contains template
Usage:
{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
*/}}
{{- define "relay-proxy.render" -}}
{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
{{- if contains "{{" (toJson .value) }}
{{- tpl $value .context }}
{{- else }}
{{- $value }}
{{- end }}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ spec:
{{- include "relay-proxy.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
{{- if .Values.podAnnotations }}
{{- include "relay-proxy.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
labels:
{{- include "relay-proxy.selectorLabels" . | nindent 8 }}
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{{- range .Values.extraManifests }}
---
{{ include "relay-proxy.render" (dict "value" . "context" $) }}
{{- end }}
26 changes: 26 additions & 0 deletions cmd/relayproxy/helm-charts/relay-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,29 @@ tolerations: []

# -- Affinity settings for pod assignment to nodes
affinity: {}

# -- Array of extra objects to deploy with the release (evaluated as a template)
extraManifests: []
# - kind: Role
# apiVersion: rbac.authorization.k8s.io/v1
# metadata:
# name: feature-flags-relay-proxy
# namespace: "{{ .Release.Namespace }}"
# rules:
# - apiGroups: [""]
# resources:
# - configmaps
# verbs:
# - get
# - kind: RoleBinding
# apiVersion: rbac.authorization.k8s.io/v1
# metadata:
# name: feature-flags-relay-proxy
# namespace: "{{ .Release.Namespace }}"
# subjects:
# - kind: ServiceAccount
# name: feature-flags-relay-proxy
# roleRef:
# kind: Role
# name: feature-flags-relay-proxy
# apiGroup: ""
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.cli.jvm.main

plugins {
kotlin("jvm") version "2.0.0"
kotlin("jvm") version "2.0.10"
application
id("com.github.johnrengelman.shadow") version "8.1.1"
id("java")
Expand Down
Loading

0 comments on commit 543b4f0

Please sign in to comment.