Skip to content

Commit

Permalink
feat: custom proxy suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
mloiseleur committed Jan 4, 2024
1 parent cf17114 commit 3261e9f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 36 deletions.
2 changes: 1 addition & 1 deletion traefikee/templates/proxy/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.cluster }}-proxy
name: {{ .Values.cluster }}-{{ .Values.proxy.suffix }}
namespace: {{ .Release.Namespace }}
labels:
{{- include "common.labels" . | nindent 4 }}
Expand Down
3 changes: 2 additions & 1 deletion traefikee/tests/proxy_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ tests:
image.tag: "myspecialversion"
image.pullPolicy: Never
proxy:
suffix: external-proxy
replicas: 2
affinity: null
readinessProbe: null
Expand All @@ -73,7 +74,7 @@ tests:
of: apps/v1
- equal:
path: metadata.name
value: mysupertraefikee-proxy
value: mysupertraefikee-external-proxy
- equal:
path: spec.template.spec.containers[0].image
value: "my.registry/my/repository:myspecialversion"
Expand Down
51 changes: 17 additions & 34 deletions traefikee/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,12 @@ registry:
values:
- registry
topologyKey: "kubernetes.io/hostname"
# serviceLabels:
# foo: bar
# serviceAnnotations:
# foo: bar
# statefulSetLabels:
# foo: bar
# statefulSetAnnotations:
# foo: bar
# podLabels:
# foo: bar
# podAnnotations:
# foo: bar
serviceLabels: {}
serviceAnnotations: {}
statefulSetLabels: {}
statefulSetAnnotations: {}
podLabels: {}
podAnnotations: {}
## Needed if you setup the registry token manually before deploying TraefikEE
# manualTokenSecret: true
# tokenSecretRef:
Expand Down Expand Up @@ -132,31 +126,18 @@ controller:
allowEmptyServices: true
ingressClass:
# serviceLabels:
# foo: bar
# serviceAnnotations:
# foo: bar
# statefulSetLabels:
# foo: bar
# statefulSetAnnotations:
# foo: bar
# podLabels:
# foo: bar
# podAnnotations:
# foo: bar
# additionalArguments:
serviceLabels: {}
serviceAnnotations: {}
statefulSetLabels: {}
statefulSetAnnotations: {}
podLabels: {}
podAnnotations: {}
additionalArguments:
# - --foo=bar
# env:
# - name: FOO
# value: 1
# - name: BAR
# valueFrom:
# secretKeyRef:
# name: foo
# key: BAR
env:
# # This example topologySpreadConstraints forces the scheduler to put traefikee controller pods
# # on nodes where no other traefikee controller pods are scheduled.
# topologySpreadConstraints:
topologySpreadConstraints:
# - labelSelector:
# matchLabels:
# app: traefikee
Expand All @@ -168,6 +149,8 @@ controller:
tolerations: []

proxy:
## Proxy name is built with cluster name + this suffix.
suffix: proxy
# Can be set to null when using HPA, in order to avoid conflict between HPA
# and this Chart on replicas.
replicas: 2
Expand Down

0 comments on commit 3261e9f

Please sign in to comment.