From b13093d7d656beb24bf4a66e691e816050b82a02 Mon Sep 17 00:00:00 2001 From: Saman Mahdanian Date: Tue, 29 Aug 2023 16:10:40 +0330 Subject: [PATCH] clenaup samples unsynced changes --- config/manager/manager.yaml | 2 +- config/samples/cerberus_service.yaml | 2 +- config/samples/cerberus_v1alpha1_accesstoken.yaml | 4 ++-- .../cerberus_v1alpha1_webserviceaccessbinding.yaml | 4 ++-- config/samples/echo_server.yaml | 4 ++-- config/samples/projectcontour_v1_extentionservice.yaml | 2 +- config/samples/projectcontour_v1_httpproxy.yaml | 9 ++++----- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index e80a404..e848e57 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -71,7 +71,7 @@ spec: - "--tls-key-path=/opt/cert/tls.key" - "--tls-cert-path=/opt/cert/tls.crt" - "--tls-ca-path=/opt/cert/ca.crt" - image: ghcr.io/snapp-incubator/cerberus:fad810 + image: ghcr.io/snapp-incubator/cerberus:1.0.1 name: manager volumeMounts: - mountPath: /opt/cert diff --git a/config/samples/cerberus_service.yaml b/config/samples/cerberus_service.yaml index bc5e087..d25c63c 100644 --- a/config/samples/cerberus_service.yaml +++ b/config/samples/cerberus_service.yaml @@ -12,7 +12,7 @@ metadata: name: cerberus spec: ports: - - name: https + - name: grpc port: 8082 protocol: TCP targetPort: grpc diff --git a/config/samples/cerberus_v1alpha1_accesstoken.yaml b/config/samples/cerberus_v1alpha1_accesstoken.yaml index c36b697..64a8fc0 100644 --- a/config/samples/cerberus_v1alpha1_accesstoken.yaml +++ b/config/samples/cerberus_v1alpha1_accesstoken.yaml @@ -5,7 +5,7 @@ metadata: labels: cerberus.snappcloud.io/secret: "true" data: - token: c2FsYW1zYWxhbQo= + token: c2FsYW1zYWxhbQ== --- apiVersion: cerberus.snappcloud.io/v1alpha1 kind: AccessToken @@ -20,4 +20,4 @@ metadata: spec: active: Active secretRef: - name: "sample-access" + name: "cerberus-sample-access" diff --git a/config/samples/cerberus_v1alpha1_webserviceaccessbinding.yaml b/config/samples/cerberus_v1alpha1_webserviceaccessbinding.yaml index e0333be..3599274 100644 --- a/config/samples/cerberus_v1alpha1_webserviceaccessbinding.yaml +++ b/config/samples/cerberus_v1alpha1_webserviceaccessbinding.yaml @@ -10,6 +10,6 @@ metadata: name: webserviceaccessbinding-sample spec: subjects: - - accesstoken-sample + - cerberus-accesstoken-sample webservices: - - webservice-sample + - cerberus-webservice-sample diff --git a/config/samples/echo_server.yaml b/config/samples/echo_server.yaml index ae83770..526d054 100644 --- a/config/samples/echo_server.yaml +++ b/config/samples/echo_server.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: echo-deployment + name: echo spec: replicas: 1 selector: @@ -22,7 +22,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: echo-service + name: echo spec: ports: - name: http-port diff --git a/config/samples/projectcontour_v1_extentionservice.yaml b/config/samples/projectcontour_v1_extentionservice.yaml index 48451f3..ee2d727 100644 --- a/config/samples/projectcontour_v1_extentionservice.yaml +++ b/config/samples/projectcontour_v1_extentionservice.yaml @@ -5,5 +5,5 @@ metadata: spec: protocol: h2 services: - - name: cerberus + - name: cerberus-cerberus port: 8082 diff --git a/config/samples/projectcontour_v1_httpproxy.yaml b/config/samples/projectcontour_v1_httpproxy.yaml index b4922a1..97493d0 100644 --- a/config/samples/projectcontour_v1_httpproxy.yaml +++ b/config/samples/projectcontour_v1_httpproxy.yaml @@ -2,7 +2,6 @@ apiVersion: projectcontour.io/v1 kind: HTTPProxy metadata: name: cerberus-test-route - namespace: monitoring spec: ingressClassName: private routes: @@ -11,8 +10,8 @@ spec: enableWebsockets: false permitInsecure: false services: - - name: health-be - port: 8080 + - name: cerberus-echo + port: 80 weight: 100 timeoutPolicy: idle: 5m @@ -23,7 +22,7 @@ spec: authorization: extensionRef: namespace: cerberus-system - name: cerberus-auth + name: cerberus-cerberus-auth authPolicy: context: - X-Cerberus-Webservice: "cerberus-webservice-sample" + webservice: cerberus-webservice-sample