From 2cf715e95821855b226fc846e6662b4844d0d901 Mon Sep 17 00:00:00 2001
From: Nico P <nickpoegel@aol.com>
Date: Sun, 30 Oct 2022 16:54:46 +0100
Subject: [PATCH] fixed auth-service-service-profile
---
.../auth-service-service-profile.yml | 2 +-
.../deployment/client-test-deployment.yml | 25 ---------
.../deployment/server-test-deployment.yml | 22 --------
.../ingress_route/ingressroute-no-auth.yml | 31 -----------
.../ingress_route/ingressroute-with-auth.yml | 55 -------------------
.../viz-dashboard-ingressroute.yml | 52 ------------------
.../templates/service/client-test-service.yml | 12 ----
.../templates/service/server-test-service.yml | 12 ----
.../auth-service-service-profile.yml | 2 +-
.../server-test-service-profile.yml | 13 -----
10 files changed, 2 insertions(+), 224 deletions(-)
delete mode 100644 helm/helm-msa/templates/deployment/client-test-deployment.yml
delete mode 100644 helm/helm-msa/templates/deployment/server-test-deployment.yml
delete mode 100644 helm/helm-msa/templates/ingress_route/ingressroute-no-auth.yml
delete mode 100644 helm/helm-msa/templates/ingress_route/ingressroute-with-auth.yml
delete mode 100644 helm/helm-msa/templates/ingress_route/viz-dashboard-ingressroute.yml
delete mode 100644 helm/helm-msa/templates/service/client-test-service.yml
delete mode 100644 helm/helm-msa/templates/service/server-test-service.yml
delete mode 100644 helm/helm-msa/templates/service_profile/server-test-service-profile.yml
diff --git a/config/service_profile/auth-service-service-profile.yml b/config/service_profile/auth-service-service-profile.yml
index d68a1f0..810a9d5 100644
--- a/config/service_profile/auth-service-service-profile.yml
+++ b/config/service_profile/auth-service-service-profile.yml
@@ -11,4 +11,4 @@ spec:
pathRegex: /login
name: POST /login
isRetryable: true
- timeout 200ms
+ timeout: 200ms
diff --git a/helm/helm-msa/templates/deployment/client-test-deployment.yml b/helm/helm-msa/templates/deployment/client-test-deployment.yml
deleted file mode 100644
index e069fc4..0000000
--- a/helm/helm-msa/templates/deployment/client-test-deployment.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: client-test-deployment
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: client-test
- template:
- metadata:
- annotations:
- linkerd.io/inject: enabled
- labels:
- app: client-test
- spec:
- containers:
- - name: client
- image: ginyanote/client-test:1.0.0
- imagePullPolicy: IfNotPresent
- ports:
- - containerPort: 8081
- env:
- - name: SERVER_HOST
- value: "server-test-service"
diff --git a/helm/helm-msa/templates/deployment/server-test-deployment.yml b/helm/helm-msa/templates/deployment/server-test-deployment.yml
deleted file mode 100644
index 779dd76..0000000
--- a/helm/helm-msa/templates/deployment/server-test-deployment.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: server-test-deployment
-spec:
- replicas: 3
- selector:
- matchLabels:
- app: server-test
- template:
- metadata:
- annotations:
- linkerd.io/inject: enabled
- labels:
- app: server-test
- spec:
- containers:
- - name: server
- image: ginyanote/server-test:1.0.0
- imagePullPolicy: IfNotPresent
- ports:
- - containerPort: 8080
diff --git a/helm/helm-msa/templates/ingress_route/ingressroute-no-auth.yml b/helm/helm-msa/templates/ingress_route/ingressroute-no-auth.yml
deleted file mode 100644
index 2e7c3eb..0000000
--- a/helm/helm-msa/templates/ingress_route/ingressroute-no-auth.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
- annotations:
- kubernetes.io/ingress.class: traefik
- creationTimestamp: null
- name: ingress-no-auth
- namespace: default
-spec:
- routes:
- - kind: Rule
- match: PathPrefix(`/health`)
- services:
- - kind: Service
- name: client-test-service
- namespace: default
- port: 8081
- - kind: Rule
- match: PathPrefix(`/user`)
- services:
- - kind: Service
- name: auth-service-service
- namespace: default
- port: 5000
- - kind: Rule
- match: PathPrefix(`/login`)
- services:
- - kind: Service
- name: auth-service-service
- namespace: default
- port: 5000
diff --git a/helm/helm-msa/templates/ingress_route/ingressroute-with-auth.yml b/helm/helm-msa/templates/ingress_route/ingressroute-with-auth.yml
deleted file mode 100644
index 978108e..0000000
--- a/helm/helm-msa/templates/ingress_route/ingressroute-with-auth.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
- annotations:
- kubernetes.io/ingress.class: traefik
- creationTimestamp: null
- name: ingress-with-auth
- namespace: default
-spec:
- routes:
- - kind: Rule
- match: PathPrefix(`/message`)
- middlewares:
- - name: auth-4917873474387576508
- namespace: default
- services:
- - kind: Service
- name: client-test-service
- namespace: default
- port: 8081
- - kind: Rule
- match: PathPrefix(`/logout`)
- middlewares:
- - name: auth-4917873474387576508
- namespace: default
- services:
- - kind: Service
- name: auth-service-service
- namespace: default
- port: 5000
- - kind: Rule
- match: PathPrefix(`/blacklist/cleanup`)
- middlewares:
- - name: auth-4917873474387576508
- namespace: default
- services:
- - kind: Service
- name: auth-service-service
- namespace: default
- port: 5000
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
- creationTimestamp: null
- name: auth-4917873474387576508
- namespace: default
-spec:
- forwardAuth:
- address: http://auth-service-service.default.svc.cluster.local:5000/verify
- authResponseHeaders:
- - UserID
- - IsAdmin
- - UserRoles
- tls: {}
diff --git a/helm/helm-msa/templates/ingress_route/viz-dashboard-ingressroute.yml b/helm/helm-msa/templates/ingress_route/viz-dashboard-ingressroute.yml
deleted file mode 100644
index 9b45d03..0000000
--- a/helm/helm-msa/templates/ingress_route/viz-dashboard-ingressroute.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
- name: web-ingress-auth
- namespace: linkerd-viz
-data:
- auth: YWRtaW46JGFwcjEkbjdDdTZnSGwkRTQ3b2dmN0NPOE5SWWpFakJPa1dNLgoK
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
- annotations:
- kubernetes.io/ingress.class: traefik
- creationTimestamp: null
- name: web-ingress
- namespace: linkerd-viz
-spec:
- routes:
- - kind: Rule
- match: PathPrefix(`/`)
- middlewares:
- - name: auth-12615798825126772440
- namespace: linkerd-viz
- - name: headers-15820832024145736740
- namespace: linkerd-viz
- services:
- - kind: Service
- name: web
- namespace: linkerd-viz
- port: 8084
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
- creationTimestamp: null
- name: auth-12615798825126772440
- namespace: linkerd-viz
-spec:
- basicAuth:
- secret: web-ingress-auth
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
- creationTimestamp: null
- name: headers-15820832024145736740
- namespace: linkerd-viz
-spec:
- headers:
- customRequestHeaders:
- L5d-Dst-Override: web.linkerd-viz.svc.cluster.local:8084
diff --git a/helm/helm-msa/templates/service/client-test-service.yml b/helm/helm-msa/templates/service/client-test-service.yml
deleted file mode 100644
index dfcf9db..0000000
--- a/helm/helm-msa/templates/service/client-test-service.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: client-test-service
-spec:
- selector:
- app: client-test
- ports:
- - protocol: TCP
- port: 8081
- targetPort: 8081
- type: ClusterIP
\ No newline at end of file
diff --git a/helm/helm-msa/templates/service/server-test-service.yml b/helm/helm-msa/templates/service/server-test-service.yml
deleted file mode 100644
index c9ee02e..0000000
--- a/helm/helm-msa/templates/service/server-test-service.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: server-test-service
-spec:
- selector:
- app: server-test
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- type: ClusterIP
\ No newline at end of file
diff --git a/helm/helm-msa/templates/service_profile/auth-service-service-profile.yml b/helm/helm-msa/templates/service_profile/auth-service-service-profile.yml
index d68a1f0..810a9d5 100644
--- a/helm/helm-msa/templates/service_profile/auth-service-service-profile.yml
+++ b/helm/helm-msa/templates/service_profile/auth-service-service-profile.yml
@@ -11,4 +11,4 @@ spec:
pathRegex: /login
name: POST /login
isRetryable: true
- timeout 200ms
+ timeout: 200ms
diff --git a/helm/helm-msa/templates/service_profile/server-test-service-profile.yml b/helm/helm-msa/templates/service_profile/server-test-service-profile.yml
deleted file mode 100644
index dcacc7b..0000000
--- a/helm/helm-msa/templates/service_profile/server-test-service-profile.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: linkerd.io/v1alpha2
-kind: ServiceProfile
-metadata:
- creationTimestamp: null
- name: server-test-service-profile
- namespace: default
-spec:
- routes:
- - condition:
- method: POST
- pathRegex: /message
- name: POST /message
- isRetryable: true
\ No newline at end of file
--
GitLab