Merge branch 'features/lor-octavia-lb-svc-create' into 'develop'
Features/lor octavia lb svc create See merge request ldc-web/cluster-k8s!77
This commit is contained in:
commit
f545cefcca
1 changed files with 39 additions and 11 deletions
|
|
@ -15,7 +15,6 @@ spec:
|
|||
name: traefik
|
||||
namespace: common-services
|
||||
values:
|
||||
|
||||
image:
|
||||
tag: v3.3.6
|
||||
|
||||
|
|
@ -88,7 +87,7 @@ spec:
|
|||
enabled: true
|
||||
|
||||
extraObjects:
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-www-to-no-www
|
||||
|
|
@ -103,7 +102,7 @@ spec:
|
|||
# How to modify the URL to have the new target URL
|
||||
replacement: "https://${1}"
|
||||
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-www-to-no-www
|
||||
|
|
@ -118,7 +117,7 @@ spec:
|
|||
# How to modify the URL to have the new target URL
|
||||
replacement: "https://${1}"
|
||||
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-www-to-no-www
|
||||
|
|
@ -133,7 +132,7 @@ spec:
|
|||
# How to modify the URL to have the new target URL
|
||||
replacement: "https://${1}"
|
||||
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-www-to-no-www
|
||||
|
|
@ -150,7 +149,7 @@ spec:
|
|||
|
||||
# Redirection to www for common-services namespace
|
||||
# TODO: remove this middleware when all sites been updated
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-no-www-to-www
|
||||
|
|
@ -166,7 +165,7 @@ spec:
|
|||
replacement: "https://www.${1}"
|
||||
|
||||
# Redirection to www for production namespace
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-no-www-to-www
|
||||
|
|
@ -182,7 +181,7 @@ spec:
|
|||
replacement: "https://www.${1}"
|
||||
|
||||
# Redirection from www to domain for staging
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-no-www-to-www
|
||||
|
|
@ -197,7 +196,7 @@ spec:
|
|||
replacement: "https://${1}"
|
||||
|
||||
# Redirection from www to domain for review
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect no-www URLs to their www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: redirect-no-www-to-www
|
||||
|
|
@ -285,7 +284,7 @@ spec:
|
|||
- 149.202.23.64/26 # LDC
|
||||
- 151.80.95.176/28 # LDC
|
||||
- 217.15.92.64/28 # LDC
|
||||
- 3.77.67.4 # UptimeRobot
|
||||
- 3.77.67.4 # UptimeRobot
|
||||
- 3.79.134.69 # UptimeRobot
|
||||
- 18.192.166.72 # UptimeRobot
|
||||
- 18.193.252.127 # UptimeRobot
|
||||
|
|
@ -317,7 +316,7 @@ spec:
|
|||
- 157.90.156.63 # UptimeRobot
|
||||
- 168.119.53.160 # UptimeRobot
|
||||
- 168.119.96.239 # UptimeRobot
|
||||
- 49.13.164.148 # UptimeRobot
|
||||
- 49.13.164.148 # UptimeRobot
|
||||
- 49.13.167.123 # UptimeRobot
|
||||
- 78.46.190.63 # UptimeRobot
|
||||
- 78.47.173.76 # UptimeRobot
|
||||
|
|
@ -345,3 +344,32 @@ spec:
|
|||
services:
|
||||
- name: mariadb
|
||||
port: 3306
|
||||
|
||||
# AJOUT : Service Octavia en parallèle
|
||||
- apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: traefik-octavia
|
||||
namespace: common-services
|
||||
annotations:
|
||||
loadbalancer.ovhcloud.com/class: "octavia"
|
||||
loadbalancer.openstack.org/proxy-protocol: "v2"
|
||||
loadbalancer.openstack.org/keep-floatingip: "true"
|
||||
# Protection Flux : empêche la suppression accidentelle
|
||||
kustomize.toolkit.fluxcd.io/prune: disabled
|
||||
spec:
|
||||
type: LoadBalancer
|
||||
externalTrafficPolicy: Local
|
||||
# PAS de loadBalancerIP : on laisse Octavia attribuer une IP DHCP
|
||||
selector:
|
||||
app.kubernetes.io/name: traefik
|
||||
app.kubernetes.io/instance: traefik-common-services
|
||||
ports:
|
||||
- name: websecure
|
||||
port: 443
|
||||
targetPort: 8443
|
||||
protocol: TCP
|
||||
- name: mariadb
|
||||
port: 54322
|
||||
targetPort: 54322
|
||||
protocol: TCP
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue