Commit ba956229 authored by Jonathan Schaeffer's avatar Jonathan Schaeffer
Browse files

Modif des overlays

parent fc23177e
......@@ -41,26 +41,29 @@ metadata:
name: ws-logstodb-service
spec:
ports:
- nodePort: 30004
port: 8000
- port: 8000
protocol: TCP
targetPort: 8000
selector:
app: ws-logstodb
type: NodePort
type: ClusterIP
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ws-logstodb-ingress
labels:
app: ws-logstodb
annotations:
nginx.org/rewrites: "serviceName=ws-logstodb-service rewrite=/;"
nginx.ingress.kubernetes.io/rewrite-target: /$1
spec:
rules:
- host: wstest.resif.fr
http:
- http:
paths:
- path: /resif-private/ws-logstodb/1
- path: /wslogstodb/1/(.*)
pathType: Prefix
backend:
serviceName: ws-logstodb
servicePort: 8000
service:
name: ws-logstodb-service
port:
number: 8000
apiVersion: v1
kind: Secret
metadata:
name: ws-logstodb-secrets
name: ws-logstodb-secrets-preprod
type: Opaque
stringData:
resifstatsPgpassword: ENC[AES256_GCM,data:e1VN3Cuyj/Gsg28HN8KiRQ==,iv:+do7XwIrjkoRX7/YbPoODpF1LjkecvULmu9E19Ps1GM=,tag:CGReeJTKKx2acnSJt5jraQ==,type:str]
......
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ws-logstodb-ingress
labels:
app: ws-logstodb
environment: production
annotations:
nginx.org/rewrites: "serviceName=ws-logstodb-service-prod rewrite=/;"
nginx.ingress.kubernetes.io/rewrite-target: /$1
spec:
rules:
- host: resif-kprod.u-ga.fr
http:
- http:
paths:
- path: /ws-logstodb/1
- path: /logstodb/1/(.*)
pathType: Prefix
backend:
serviceName: ws-logstodb-prod
servicePort: 8000
service:
name: ws-logstodb-service
port:
number: 8000
nameSuffix: -preprod
nameSuffix: -prod
commonLabels:
environment: preprod
environment: production
bases:
- ../../base
images:
......@@ -11,4 +11,3 @@ images:
patches:
- ws-logstodb.yaml
- map.yaml
- ingress.yaml
......@@ -3,4 +3,4 @@ kind: ConfigMap
metadata:
name: ws-logstodb-map
data:
database_uri: postgresql://resifstats@resif-pgpreprod.u-ga.fr:5432/resifstats
database_uri: postgresql://resifstats@resif-pgprod.u-ga.fr:5432/resifstats
apiVersion: v1
kind: Secret
metadata:
name: ws-logstodb-secrets
name: ws-logstodb-secrets-prod
type: Opaque
stringData:
resifstatsPgpassword: ENC[AES256_GCM,data:e1VN3Cuyj/Gsg28HN8KiRQ==,iv:+do7XwIrjkoRX7/YbPoODpF1LjkecvULmu9E19Ps1GM=,tag:CGReeJTKKx2acnSJt5jraQ==,type:str]
pgpassword: ENC[AES256_GCM,data:gF5Y+QHIWnt7X+1T,iv:p7jVBwy9exewNaglUdrsnZxCc7YH+1ZNX+GIIhxIepA=,tag:b61vnq/LXE2gbc74zl6eJw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
lastmodified: '2020-08-13T14:16:29Z'
mac: ENC[AES256_GCM,data:2aSPXdZPjIvSOoSPiskFcRBxNAY1faNavtStMObqsDmXjHDgfSjpbFRSmKYIMD+/zSkB5C8VaTIYsI+XpoG4NbnqsNzlWUibuaDWzkPuaQnQ2EvxiHWy7snEzbigc+jqkNaJGL9jnw2Ru2VbdpYH8a+wnEsy2WCmV9rwuKrJK7o=,iv:4MkScbf5YfKWhQOD5GCK3fTE6u2yD/Sz93k1NdPjExY=,tag:ck95tfGHCEL/JzsSzu6rHw==,type:str]
lastmodified: '2020-12-08T15:15:38Z'
mac: ENC[AES256_GCM,data:kA9WJ7izErWupiSAQdj8Gs/CySn7/6FigL1e6SgHyu9Ue6GZsakCoBa+sKz8ftEdeY8WbIWoHn9kr0eSU151dL2ONe3ZpY2WpZ9DYnilpdsRQcnXwbIgyycaSWjUj81u5mMC7PvVyrwxDkYKDLurjw4HHgOkeCrptfA6nVxIp6Y=,iv:j7Wsk1gx1nz+pR3OU89+KoEmeTFSzWjVGDpf2I5+HN0=,tag:yXPC4IjpdVkH2BCF/CA8fQ==,type:str]
pgp:
- created_at: '2020-06-19T14:00:02Z'
- created_at: '2020-12-08T15:10:20Z'
enc: |
-----BEGIN PGP MESSAGE-----
hQEMA23uPS/3Y9M2AQgAjx0vTXHspE9LneeGi/ev/xk0A8yi3DxgJsZVtEsbSQwL
5ZijJ0wI/p0y2HzPlhl+w9INKcMQUxGo2Z184AIEwWFL8TbN97x700xiAV2gLTSq
yapwXwGloZZMCV6oWmktTA3IPeeLmGHpaR4lY4IR8iBAJophG9tc8C73xRQTzWec
ev3C+wtLnTlxpUhZj2foZ7B2ARAlE2LWqT2I3wp7d1ZJYmSrdJpltarMaJiw18X8
lpmJ/SmTO8ITRrPvtxZfBBlzNAAjbC0ed8Qs3RUHa1PSh/VeiOnefkz0lBQNKxvZ
JknwRw2AsGW0KirSLk9av7djUmasbf6mj+n8Tvi2J9JeAU4eCVRTc/AP+UFq5Ynn
yi79EnUAbM+19apxYkYQME4i2FrhnUtlcdrRNvwIBz1DOa12Z/8W7gdrpwFlM9mK
CjptN6pgRXNnV7yegPX8cJCGaoWB+TPpKheAwE3CMQ==
=CH3Z
hQEMA23uPS/3Y9M2AQgAvKZAOlT/BDYKpLqhGpON4RYDa917r5TVN5F+2WTB4GRD
qSi5btqOaNmP3FlYmcxUM1TkH6Psdgn1AIkRg4CW51EYpndt9/wjV+ys+lVE1dxk
W9FBdlMt420mc30Lmal1LWlL5qj/SABheOHquIgMgCtnlwdxr+C9uTSdyqTzUPYZ
FWp/9tMIDpE/fKofSXT9w2YBIvgXXC6Kn6uCLgtmapvAWccUD0J3z54SjDSjXMKl
VDlxwE8LZrxVK1765H1y7zP8oFDSLMdj1JKAfwwKfdOhjW7TO2A/c1sG0PU1zScm
yuheSPcSljCeWIapyy4xmHtQs10ixRgs10RtjRJmkdJcAWDhFhCttZxPzy/ftqG4
qTTz4UBr9/bPD9Z8L+Q9q8ZnVYXK+OL6hUB5NGX2C9sBby6wWBPOgOUVRMdIl7qT
D1Wbz+h9FUP5FtslYhqseijZr+ME/MR04gfgMOw=
=X5MJ
-----END PGP MESSAGE-----
fp: C83ECA1E0B9D719C7FA2470F18E4F5A58801E669
encrypted_regex: ^(data|stringData)$
......
......@@ -12,4 +12,4 @@ spec:
- name: PGPASSWORD
valueFrom:
secretKeyRef:
name: ws-logstodb-secrets-preprod
name: ws-logstodb-secrets-prod
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment