major(ingress): Migrate hel1 to ha-proxy controller #192
@@ -47,7 +47,7 @@ service:
|
|||||||
port: 8080
|
port: 8080
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: nginx
|
className: haproxy
|
||||||
persistence:
|
persistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
size: 1G
|
size: 1G
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ service:
|
|||||||
port: 8080
|
port: 8080
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: nginx
|
className: haproxy
|
||||||
persistence:
|
persistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
size: 1G
|
size: 1G
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
bases:
|
||||||
|
- ../envs/environments.yaml.gotmpl
|
||||||
|
|
||||||
|
repositories:
|
||||||
|
- name: haproxytech
|
||||||
|
oci: true
|
||||||
|
url: 'ghcr.io/haproxytech/helm-charts'
|
||||||
|
|
||||||
|
commonLabels:
|
||||||
|
tier: system
|
||||||
|
|
||||||
|
releases:
|
||||||
|
- name: ingress-haproxy
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
chart: haproxytech/kubernetes-ingress
|
||||||
|
version: 1.42.0
|
||||||
|
condition: haproxy.enabled
|
||||||
|
values:
|
||||||
|
- ../values/ingress-haproxy/values/ingress-haproxy.yaml.gotmpl
|
||||||
|
- ../values/ingress-haproxy/values/ingress-haproxy-{{ .Environment.Name }}.yaml.gotmpl
|
||||||
|
postRenderer: ../bin/kustomizer
|
||||||
|
postRendererArgs:
|
||||||
|
- ../values/ingress-haproxy/kustomize/{{ .Environment.Name }}
|
||||||
|
missingFileHandler: Info
|
||||||
|
- name: manifests
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
chart: manifests
|
||||||
|
condition: haproxy.enabled
|
||||||
|
missingFileHandler: Info
|
||||||
|
values:
|
||||||
|
- ../values/env.yaml
|
||||||
|
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||||
|
- ../values/ingress-haproxy/env.yaml.gotmpl
|
||||||
|
- ../values/ingress-haproxy/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||||
|
hooks:
|
||||||
|
- events: [ prepare, cleanup ]
|
||||||
|
showlogs: true
|
||||||
|
command: ../bin/helmify
|
||||||
|
args:
|
||||||
|
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
|
||||||
|
- '{{`{{ .Release.Chart }}`}}'
|
||||||
|
- '{{`{{ .Environment.Name }}`}}'
|
||||||
|
- ../values/ingress-haproxy/manifests
|
||||||
|
- manifests
|
||||||
@@ -3,17 +3,14 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
haproxy.org/backend-protocol: h1
|
||||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
haproxy.org/timeout-server: 600s
|
||||||
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
|
|
||||||
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
|
|
||||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: attic
|
app.kubernetes.io/component: attic
|
||||||
name: attic
|
name: attic
|
||||||
namespace: attic
|
namespace: attic
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: nginx
|
ingressClassName: haproxy
|
||||||
rules:
|
rules:
|
||||||
- host: attic.srv.oceanbox.io
|
- host: attic.srv.oceanbox.io
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -8,13 +8,11 @@ env:
|
|||||||
value: "1"
|
value: "1"
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: "nginx"
|
className: "haproxy"
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
haproxy.org/backend-protocol: h1
|
||||||
nginx.ingress.kubernetes.io/enable-cors: "true"
|
haproxy.org/cors-enable: "true"
|
||||||
nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
|
|
||||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
|
||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
hosts:
|
hosts:
|
||||||
- host: docs.oceanbox.io
|
- host: docs.oceanbox.io
|
||||||
|
|||||||
@@ -3,17 +3,15 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: ca-issuer
|
cert-manager.io/cluster-issuer: ca-issuer
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
haproxy.org/backend-protocol: h1
|
||||||
nginx.ingress.kubernetes.io/cors-allow-headers: Content-Type, x-gatus-cache
|
haproxy.org/cors-allow-headers: Content-Type, x-gatus-cache
|
||||||
nginx.ingress.kubernetes.io/enable-cors: "true"
|
haproxy.org/cors-enable: "true"
|
||||||
nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
|
|
||||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: gatus
|
app.kubernetes.io/name: gatus
|
||||||
name: gatus
|
name: gatus
|
||||||
namespace: uptime
|
namespace: uptime
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: nginx
|
ingressClassName: haproxy
|
||||||
rules:
|
rules:
|
||||||
- host: uptime.adm.hel1.obx
|
- host: uptime.adm.hel1.obx
|
||||||
http:
|
http:
|
||||||
@@ -24,7 +22,7 @@ spec:
|
|||||||
port:
|
port:
|
||||||
number: 80
|
number: 80
|
||||||
path: /
|
path: /
|
||||||
pathType: ImplementationSpecific
|
pathType: Prefix
|
||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- uptime.adm.hel1.obx
|
- uptime.adm.hel1.obx
|
||||||
|
|||||||
@@ -135,15 +135,12 @@ gitea:
|
|||||||
|
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: nginx
|
className: haproxy
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
haproxy.org/backend-protocol: h1
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
haproxy.org/timeout-server: 600s
|
||||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
haproxy.org/allow-list: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24,100.64.0.0/12,185.125.160.4/32,37.27.203.38/32
|
||||||
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
|
|
||||||
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
|
|
||||||
nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,172.19.255.0/24,100.64.0.0/12,185.125.160.4/32,37.27.203.38/32
|
|
||||||
hosts:
|
hosts:
|
||||||
- host: git.oceanbox.io
|
- host: git.oceanbox.io
|
||||||
paths:
|
paths:
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
haproxy:
|
||||||
|
enabled: true
|
||||||
|
autosync: true
|
||||||
|
pdb:
|
||||||
|
minAvailable: 1
|
||||||
|
resources:
|
||||||
|
controller:
|
||||||
|
cpu: "100m"
|
||||||
|
memory: "100Mi"
|
||||||
|
annotations:
|
||||||
|
load-balancer.hetzner.cloud/http-redirect-http: "true"
|
||||||
|
load-balancer.hetzner.cloud/location: hel1
|
||||||
|
load-balancer.hetzner.cloud/name: load-balancer-1
|
||||||
|
load-balancer.hetzner.cloud/type: lb11
|
||||||
|
load-balancer.hetzner.cloud/use-private-ip: "true"
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
haproxy:
|
||||||
|
enabled: false
|
||||||
|
autosync: true
|
||||||
|
pdb:
|
||||||
|
minAvailable: 1
|
||||||
|
resources:
|
||||||
|
controller:
|
||||||
|
cpu: "100m"
|
||||||
|
memory: "100Mi"
|
||||||
|
annotations: []
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{{- if .Values.clusterConfig.argo.enabled }}
|
||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Application
|
||||||
|
metadata:
|
||||||
|
name: ingress-haproxy
|
||||||
|
namespace: argocd
|
||||||
|
annotations:
|
||||||
|
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
|
||||||
|
spec:
|
||||||
|
destination:
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
server: 'https://kubernetes.default.svc'
|
||||||
|
sources:
|
||||||
|
- repoURL: {{ .Values.clusterConfig.manifests }}
|
||||||
|
targetRevision: HEAD
|
||||||
|
path: helmfile.d
|
||||||
|
plugin:
|
||||||
|
name: helmfile-cmp
|
||||||
|
env:
|
||||||
|
- name: CLUSTER_NAME
|
||||||
|
value: {{ .Values.clusterConfig.cluster }}
|
||||||
|
- name: HELMFILE_ENVIRONMENT
|
||||||
|
value: default
|
||||||
|
- name: HELMFILE_FILE_PATH
|
||||||
|
value: ingress-haproxy.yaml.gotmpl
|
||||||
|
project: sys
|
||||||
|
syncPolicy:
|
||||||
|
managedNamespaceMetadata:
|
||||||
|
labels:
|
||||||
|
component: sys
|
||||||
|
syncOptions:
|
||||||
|
- CreateNamespace=true
|
||||||
|
- ApplyOutOfSyncOnly=true
|
||||||
|
- ServerSideApply=true
|
||||||
|
{{- if .Values.haproxy.autosync }}
|
||||||
|
automated:
|
||||||
|
prune: true
|
||||||
|
# selfHeal: false
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
{{- if .Values.clusterConfig.cilium.enabled }}
|
||||||
|
apiVersion: cilium.io/v2
|
||||||
|
kind: CiliumNetworkPolicy
|
||||||
|
metadata:
|
||||||
|
name: allow-host-traffic
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
spec:
|
||||||
|
egress:
|
||||||
|
- toEntities:
|
||||||
|
- kube-apiserver
|
||||||
|
- host
|
||||||
|
endpointSelector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/name: kubernetes-ingress
|
||||||
|
app.kubernetes.io/instance: ingress-haproxy
|
||||||
|
{{- end }}
|
||||||
+16
@@ -0,0 +1,16 @@
|
|||||||
|
{{- if .Values.clusterConfig.cilium.enabled }}
|
||||||
|
apiVersion: cilium.io/v2
|
||||||
|
kind: CiliumNetworkPolicy
|
||||||
|
metadata:
|
||||||
|
name: allow-hubble-traffic
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
spec:
|
||||||
|
egress:
|
||||||
|
- toFQDNs:
|
||||||
|
- matchPattern: hubble.*.*.*
|
||||||
|
- matchPattern: hubble.*.*.*.*
|
||||||
|
endpointSelector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/name: kubernetes-ingress
|
||||||
|
app.kubernetes.io/instance: ingress-haproxy
|
||||||
|
{{- end }}
|
||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
{{- if .Values.clusterConfig.cilium.enabled }}
|
||||||
|
apiVersion: cilium.io/v2
|
||||||
|
kind: CiliumNetworkPolicy
|
||||||
|
metadata:
|
||||||
|
name: allow-prometheus-metrics
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
spec:
|
||||||
|
endpointSelector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/instance: ingress-haproxy
|
||||||
|
ingress:
|
||||||
|
- fromEndpoints:
|
||||||
|
- matchLabels:
|
||||||
|
io.kubernetes.pod.namespace: prometheus
|
||||||
|
- toPorts:
|
||||||
|
- ports:
|
||||||
|
- port: "1024"
|
||||||
|
protocol: TCP
|
||||||
|
{{- end }}
|
||||||
+21
@@ -0,0 +1,21 @@
|
|||||||
|
{{- if .Values.clusterConfig.cilium.enabled }}
|
||||||
|
apiVersion: cilium.io/v2
|
||||||
|
kind: CiliumNetworkPolicy
|
||||||
|
metadata:
|
||||||
|
name: allow-world-to-ingress-haproxy
|
||||||
|
namespace: ingress-haproxy
|
||||||
|
spec:
|
||||||
|
endpointSelector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/name: kubernetes-ingress
|
||||||
|
app.kubernetes.io/instance: ingress-haproxy
|
||||||
|
ingress:
|
||||||
|
- fromEntities:
|
||||||
|
- world
|
||||||
|
- toPorts:
|
||||||
|
- ports:
|
||||||
|
- port: "80"
|
||||||
|
protocol: TCP
|
||||||
|
- port: "443"
|
||||||
|
protocol: TCP
|
||||||
|
{{- end }}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
## HAProxy Kubernetes Ingress Controller configuration
|
||||||
|
## Ref: https://www.haproxy.com/documentation/kubernetes-ingress/
|
||||||
|
##
|
||||||
|
controller:
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: {{ .Values.haproxy.resources.controller.cpu }}
|
||||||
|
memory: {{ .Values.haproxy.resources.controller.memory }}
|
||||||
|
|
||||||
|
ingressClass: haproxy
|
||||||
|
|
||||||
|
ingressClassResource:
|
||||||
|
name: haproxy
|
||||||
|
default: true
|
||||||
|
|
||||||
|
config:
|
||||||
|
body-size: "0"
|
||||||
|
tune.bufsize: "131072"
|
||||||
|
|
||||||
|
tolerations:
|
||||||
|
- key: unschedulable
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
|
- key: node-role.kubernetes.io/control-plane
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
|
|
||||||
|
affinity:
|
||||||
|
nodeAffinity:
|
||||||
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
nodeSelectorTerms:
|
||||||
|
- matchExpressions:
|
||||||
|
- key: kubernetes.io/hostname
|
||||||
|
operator: In
|
||||||
|
values: {{ .Values.clusterConfig.ingress_nodes }}
|
||||||
|
|
||||||
|
podAntiAffinity:
|
||||||
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
|
- labelSelector:
|
||||||
|
matchExpressions:
|
||||||
|
- key: app.kubernetes.io/instance
|
||||||
|
operator: In
|
||||||
|
values:
|
||||||
|
- ingress-haproxy
|
||||||
|
- key: app.kubernetes.io/name
|
||||||
|
operator: In
|
||||||
|
values:
|
||||||
|
- kubernetes-ingress
|
||||||
|
topologyKey: "kubernetes.io/hostname"
|
||||||
|
|
||||||
|
replicaCount: {{ .Values.clusterConfig.ingress_replica_count }}
|
||||||
|
|
||||||
|
PodDisruptionBudget:
|
||||||
|
enable: true
|
||||||
|
minAvailable: {{ .Values.haproxy.pdb.minAvailable }}
|
||||||
|
|
||||||
|
service:
|
||||||
|
{{- if .Values.clusterConfig.ingress_loadbalancer }}
|
||||||
|
type: LoadBalancer
|
||||||
|
{{- if .Values.clusterConfig.ingress_nodeport }}
|
||||||
|
nodePorts:
|
||||||
|
http: 30080
|
||||||
|
https: 30443
|
||||||
|
{{- end }}
|
||||||
|
{{- else if .Values.clusterConfig.ingress_nodeport }}
|
||||||
|
type: NodePort
|
||||||
|
externalTrafficPolicy: Local
|
||||||
|
nodePorts:
|
||||||
|
http: 30080
|
||||||
|
https: 30443
|
||||||
|
{{- else }}
|
||||||
|
type: ClusterIP
|
||||||
|
{{- end }}
|
||||||
|
annotations:
|
||||||
|
{{- with .Values.haproxy.annotations }}
|
||||||
|
{{ toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
|
hostNetwork: {{ .Values.clusterConfig.ingress_hostnetwork }}
|
||||||
|
|
||||||
|
hostPorts:
|
||||||
|
enable: {{ .Values.clusterConfig.ingress_hostport }}
|
||||||
|
http: 80
|
||||||
|
https: 443
|
||||||
|
|
||||||
|
stats:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
|
prometheus:
|
||||||
|
enabled: true
|
||||||
|
port: 1024
|
||||||
|
service:
|
||||||
|
annotations:
|
||||||
|
prometheus.io/scrape: "true"
|
||||||
|
prometheus.io/port: "1024"
|
||||||
|
|
||||||
|
serviceMonitor:
|
||||||
|
enabled: true
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
nginx:
|
nginx:
|
||||||
enabled: true
|
enabled: false
|
||||||
autosync: true
|
autosync: true
|
||||||
pdb:
|
pdb:
|
||||||
minAvailable: 1
|
minAvailable: 1
|
||||||
|
|||||||
@@ -8,13 +8,11 @@ env:
|
|||||||
value: "1"
|
value: "1"
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
className: "nginx"
|
className: "haproxy"
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
haproxy.org/backend-protocol: h1
|
||||||
nginx.ingress.kubernetes.io/enable-cors: "true"
|
haproxy.org/cors-enable: "true"
|
||||||
nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
|
|
||||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
|
||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
hosts:
|
hosts:
|
||||||
- host: makai.oceanbox.io
|
- host: makai.oceanbox.io
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ apiVersion: networking.k8s.io/v1
|
|||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
nginx.ingress.kubernetes.io/auth-signin: https://$host/oauth2/start?rd=$escaped_request_uri
|
|
||||||
nginx.ingress.kubernetes.io/auth-url: https://$host/oauth2/auth
|
|
||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
name: hubble-ui
|
name: hubble-ui
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: nginx
|
ingressClassName: haproxy
|
||||||
rules:
|
rules:
|
||||||
- host: hubble.hel1.oceanbox.io
|
- host: hubble.hel1.oceanbox.io
|
||||||
http:
|
http:
|
||||||
@@ -26,13 +24,11 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||||
nginx.ingress.kubernetes.io/proxy-buffer-size: 8k
|
|
||||||
nginx.ingress.kubernetes.io/proxy-busy-buffers-size: 16k
|
|
||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
name: hubble-ui-oauth2-proxy
|
name: hubble-ui-oauth2-proxy
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: nginx
|
ingressClassName: haproxy
|
||||||
rules:
|
rules:
|
||||||
- host: hubble.hel1.oceanbox.io
|
- host: hubble.hel1.oceanbox.io
|
||||||
http:
|
http:
|
||||||
|
|||||||
@@ -14,9 +14,8 @@ metadata:
|
|||||||
whitelist to the already existing ones
|
whitelist to the already existing ones
|
||||||
spec:
|
spec:
|
||||||
mutateExistingOnPolicyUpdate: false
|
mutateExistingOnPolicyUpdate: false
|
||||||
#precondition: has whitelist annotation or
|
|
||||||
rules:
|
rules:
|
||||||
- name: ensure-nginx-whitelist-exists
|
- name: ensure-haproxy-allowlist-exists
|
||||||
skipBackgroundRequests: true
|
skipBackgroundRequests: true
|
||||||
match:
|
match:
|
||||||
resources:
|
resources:
|
||||||
@@ -28,8 +27,8 @@ spec:
|
|||||||
patchStrategicMerge:
|
patchStrategicMerge:
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
+(nginx.ingress.kubernetes.io/whitelist-source-range): ""
|
+(haproxy.org/allow-list): ""
|
||||||
- name: append-existing-whitelist
|
- name: append-existing-haproxy-allowlist
|
||||||
skipBackgroundRequests: true
|
skipBackgroundRequests: true
|
||||||
match:
|
match:
|
||||||
resources:
|
resources:
|
||||||
@@ -39,7 +38,7 @@ spec:
|
|||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
preconditions:
|
preconditions:
|
||||||
any:
|
any:
|
||||||
- key: "{{`{{request.object.metadata.annotations.\"nginx.ingress.kubernetes.io/whitelist-source-range\"}}`}}"
|
- key: "{{`{{request.object.metadata.annotations.\"haproxy.org/allow-list\"}}`}}"
|
||||||
operator: NotEquals
|
operator: NotEquals
|
||||||
value: ""
|
value: ""
|
||||||
mutate:
|
mutate:
|
||||||
@@ -47,9 +46,9 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
{{- with .Values.clusterConfig.ingress_whitelist }}
|
{{- with .Values.clusterConfig.ingress_whitelist }}
|
||||||
nginx.ingress.kubernetes.io/whitelist-source-range: "{{`{{ @ }}`}},{{ join "," . }}"
|
haproxy.org/allow-list: "{{`{{ @ }}`}},{{ join "," . }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: add-nginx-whitelist
|
- name: add-haproxy-allowlist
|
||||||
skipBackgroundRequests: true
|
skipBackgroundRequests: true
|
||||||
match:
|
match:
|
||||||
resources:
|
resources:
|
||||||
@@ -59,7 +58,7 @@ spec:
|
|||||||
oceanbox.io/expose: internal
|
oceanbox.io/expose: internal
|
||||||
preconditions:
|
preconditions:
|
||||||
any:
|
any:
|
||||||
- key: "{{`{{request.object.metadata.annotations.\"nginx.ingress.kubernetes.io/whitelist-source-range\"}}`}}"
|
- key: "{{`{{request.object.metadata.annotations.\"haproxy.org/allow-list\"}}`}}"
|
||||||
operator: Equals
|
operator: Equals
|
||||||
value: ""
|
value: ""
|
||||||
mutate:
|
mutate:
|
||||||
@@ -67,7 +66,6 @@ spec:
|
|||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
{{- with .Values.clusterConfig.ingress_whitelist }}
|
{{- with .Values.clusterConfig.ingress_whitelist }}
|
||||||
nginx.ingress.kubernetes.io/whitelist-source-range: "{{ join "," . }}"
|
haproxy.org/allow-list: "{{ join "," . }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user