Skip to content
Snippets Groups Projects
Commit b309a76c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/155-fix-tfs-api-exposition-in-ingress-controllers-for-multi-tfs-tests' into 'develop'

Resolve "Fix TFS APi exposition in ingress controllers for multi-TFS tests"

See merge request !234
parents a172eb3b 7c150fd0
No related branches found
No related tags found
2 merge requests!235Release TeraFlowSDN 3.0,!234Resolve "Fix TFS APi exposition in ingress controllers for multi-TFS tests"
Hide whitespace changes
Inline Side-by-side
Showing
with 296 additions and 233 deletions
src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml
+ 37
− 23
View file @ b309a76c
...@@ -21,26 +21,40 @@ metadata: ...@@ -21,26 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom1 ingressClassName: tfs-ingress-class-dom1
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /()(restconf/.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(tfs-api/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom2 ingressClassName: tfs-ingress-class-dom2
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/ofc23/tfs-ingress-child.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-child ingressClassName: tfs-ingress-class-child
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/ofc23/tfs-ingress-parent.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-parent ingressClassName: tfs-ingress-class-parent
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom1.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom1 ingressClassName: tfs-ingress-class-dom1
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom2.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom2 ingressClassName: tfs-ingress-class-dom2
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom3.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom3 ingressClassName: tfs-ingress-class-dom3
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom4.yaml
+ 37
− 30
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom4 ingressClassName: tfs-ingress-class-dom4
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
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