Skip to content

Commit

Permalink
helm: Add variable: extraKopfArgs
Browse files Browse the repository at this point in the history
  • Loading branch information
nemethf committed Jan 18, 2021
1 parent ccb6eca commit 9405c97
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions helm-charts/l7mp-ingress/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ apiVersion: v2
name: l7mp-ingress
description: Ingress gateways for the l7mp service mesh
type: application
version: 0.1.6
version: 0.1.7

# TODO: Write github actions to automatically sync it with the releases.
#appVersion: latest

dependencies:
- name: l7mp-operator
version: 0.1.4
version: 0.1.5
repository: https://l7mp.io/charts

home: https://l7mp.io
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/l7mp-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v2
name: l7mp-operator
description: Operator handling CRDs of the l7mp service mesh
type: application
version: 0.1.4
version: 0.1.5

# TODO: Write github actions to automatically sync it with the releases.
#appVersion: latest
Expand Down
5 changes: 5 additions & 0 deletions helm-charts/l7mp-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ spec:
- name: the-only-one
image: "{{ .Values.image.repository }}{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.extraKopfArgs }}
env:
- name: KOPF_ARGS
value: {{ . }}
{{- end }}
3 changes: 3 additions & 0 deletions helm-charts/l7mp-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ image:
# Overrides the image tag whose default is the chart appVersion.
tag: latest

# For example: --verbose, --debug, or --quiet
extraKopfArgs: ""

rbac:
# Specifies whether RBAC resources should be created
create: true
Expand Down
4 changes: 2 additions & 2 deletions k8s-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ RUN pip install -r /requirements.txt
ADD . /src
ENV NAMESPACE default
ENV PEERING operator.l7mp.io
# CMD kopf run --namespace=$NAMESPACE /src/l7mp.py --verbose
CMD kopf run --namespace=$NAMESPACE --peering=$PEERING /src/l7mp.py
ENV KOPF_ARGS ""
CMD kopf run --namespace=$NAMESPACE --peering=$PEERING $KOPF_ARGS /src/l7mp.py

0 comments on commit 9405c97

Please sign in to comment.