From 826a09f1131b7781d58ec8ba74e8f9db68b8c57d Mon Sep 17 00:00:00 2001 From: Krishanx92 Date: Mon, 31 Jul 2023 13:46:43 +0530 Subject: [PATCH 1/3] Add CC to ratelimit service --- .../controller/ratelimitpolicy_controller.go | 11 ++++------ .../ratelimiter/ratelimiter-deployment.yaml | 20 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common-controller/internal/operator/controller/ratelimitpolicy_controller.go b/common-controller/internal/operator/controller/ratelimitpolicy_controller.go index 587f34b03..ea42600cc 100644 --- a/common-controller/internal/operator/controller/ratelimitpolicy_controller.go +++ b/common-controller/internal/operator/controller/ratelimitpolicy_controller.go @@ -198,9 +198,8 @@ func (ratelimitReconsiler *RateLimitPolicyReconciler) AddRatelimitRequest(obj k8 return []reconcile.Request{{ NamespacedName: types.NamespacedName{ - Name: string(ratelimitPolicy.Name), - Namespace: GetNamespace( - (*gwapiv1b1.Namespace)(ratelimitPolicy.Spec.TargetRef.Namespace), ratelimitPolicy.Namespace), + Name: string(ratelimitPolicy.Name), + Namespace: ratelimitPolicy.Namespace, }, }} } @@ -414,10 +413,8 @@ func addIndexes(ctx context.Context, mgr manager.Manager) error { var apis []string apis = append(apis, types.NamespacedName{ - Namespace: GetNamespace( - (*gwapiv1b1.Namespace)(ratelimitPolicy.Spec.TargetRef.Namespace), - ratelimitPolicy.Namespace), - Name: string(ratelimitPolicy.Spec.TargetRef.Name), + Namespace: ratelimitPolicy.Namespace, + Name: string(ratelimitPolicy.Spec.TargetRef.Name), }.String()) return apis }) diff --git a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml index 685a67402..ea78a14df 100644 --- a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml +++ b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml @@ -110,9 +110,9 @@ spec: - name: GRPC_CLIENT_TLS_SAN value: "{{ template "apk-helm.resource.prefix" . }}-router-service.{{ .Release.Namespace }}.svc" - name: RATELIMITER_LABEL - value: "default" + value: "default1" - name: CONFIG_GRPC_XDS_SERVER_URL - value: "{{ template "apk-helm.resource.prefix" . }}-adapter-service.{{ .Release.Namespace }}.svc:18001" + value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc:18001" - name: CONFIG_GRPC_XDS_SERVER_USE_TLS value: "true" - name: CONFIG_GRPC_XDS_CLIENT_TLS_KEY @@ -122,7 +122,7 @@ spec: - name: CONFIG_GRPC_XDS_SERVER_TLS_CACERT value: "/home/wso2/security/truststore/ratelimiter-ca.crt" - name: CONFIG_GRPC_XDS_SERVER_TLS_SAN - value: "{{ template "apk-helm.resource.prefix" . }}-adapter-service.{{ .Release.Namespace }}.svc" + value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc" {{ if and .Values.wso2.apk.dp.gatewayRuntime.tracing .Values.wso2.apk.dp.gatewayRuntime.tracing.enabled .Values.wso2.apk.dp.gatewayRuntime.tracing.configProperties }} - name: TRACING_ENABLED value: "{{ .Values.wso2.apk.dp.gatewayRuntime.tracing.enabled }}" @@ -164,10 +164,10 @@ spec: {{- else }} subPath: ca.crt {{- end }} - - name: adapter-truststore-secret-volume + - name: common-controller-truststore-secret-volume mountPath: /home/wso2/security/truststore/adapter.pem - {{- if and .Values.wso2.apk.dp.adapter.configs .Values.wso2.apk.dp.adapter.configs.tls }} - subPath: {{ .Values.wso2.apk.dp.adapter.configs.tls.certFilename | default "tls.crt" }} + {{- if and .Values.wso2.apk.dp.commonController.configs .Values.wso2.apk.dp.commonController.configs.tls }} + subPath: {{ .Values.wso2.apk.dp.commonController.configs.tls.certFilename | default "tls.crt" }} {{- else }} subPath: tls.crt {{- end }} @@ -224,12 +224,12 @@ spec: secretName: {{ template "apk-helm.resource.prefix" . }}-ratelimiter-server-cert {{- end }} defaultMode: 420 - - name: adapter-truststore-secret-volume + - name: common-controller-truststore-secret-volume secret: - {{- if and .Values.wso2.apk.dp.adapter.configs .Values.wso2.apk.dp.adapter.configs.tls }} - secretName: {{ .Values.wso2.apk.dp.adapter.configs.tls.secretName | default (printf "%s-adapter-server-cert" (include "apk-helm.resource.prefix" .)) }} + {{- if and .Values.wso2.apk.dp.commonController.configs .Values.wso2.apk.dp.commonController.configs.tls }} + secretName: {{ .Values.wso2.apk.dp.commonController.configs.tls.secretName | default (printf "%s-adapter-server-cert" (include "apk-helm.resource.prefix" .)) }} {{- else }} - secretName: {{ template "apk-helm.resource.prefix" . }}-adapter-server-cert + secretName: {{ template "apk-helm.resource.prefix" . }}-common-controller-server-cert {{- end }} defaultMode: 420 - name: router-truststore-secret-volume From 7a798b80017e1f21097ad66a8027ac6ea8d53df1 Mon Sep 17 00:00:00 2001 From: Krishanx92 Date: Mon, 31 Jul 2023 14:24:43 +0530 Subject: [PATCH 2/3] Add port change --- .../data-plane/ratelimiter/ratelimiter-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml index ea78a14df..6e71dd2ff 100644 --- a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml +++ b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml @@ -112,7 +112,7 @@ spec: - name: RATELIMITER_LABEL value: "default1" - name: CONFIG_GRPC_XDS_SERVER_URL - value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc:18001" + value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc:18005" - name: CONFIG_GRPC_XDS_SERVER_USE_TLS value: "true" - name: CONFIG_GRPC_XDS_CLIENT_TLS_KEY From 30dc90eb5193c70f5be1b0afe1dbf31db91b829d Mon Sep 17 00:00:00 2001 From: Krishanx92 Date: Mon, 31 Jul 2023 15:57:14 +0530 Subject: [PATCH 3/3] revert ratelimit helm chamge --- .../ratelimiter/ratelimiter-deployment.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml index 6e71dd2ff..218e8fed9 100644 --- a/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml +++ b/helm-charts/templates/data-plane/ratelimiter/ratelimiter-deployment.yaml @@ -110,9 +110,9 @@ spec: - name: GRPC_CLIENT_TLS_SAN value: "{{ template "apk-helm.resource.prefix" . }}-router-service.{{ .Release.Namespace }}.svc" - name: RATELIMITER_LABEL - value: "default1" + value: "default" - name: CONFIG_GRPC_XDS_SERVER_URL - value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc:18005" + value: "{{ template "apk-helm.resource.prefix" . }}-adapter-service.{{ .Release.Namespace }}.svc:18001" - name: CONFIG_GRPC_XDS_SERVER_USE_TLS value: "true" - name: CONFIG_GRPC_XDS_CLIENT_TLS_KEY @@ -122,7 +122,7 @@ spec: - name: CONFIG_GRPC_XDS_SERVER_TLS_CACERT value: "/home/wso2/security/truststore/ratelimiter-ca.crt" - name: CONFIG_GRPC_XDS_SERVER_TLS_SAN - value: "{{ template "apk-helm.resource.prefix" . }}-common-controller-service.{{ .Release.Namespace }}.svc" + value: "{{ template "apk-helm.resource.prefix" . }}-adapter-service.{{ .Release.Namespace }}.svc" {{ if and .Values.wso2.apk.dp.gatewayRuntime.tracing .Values.wso2.apk.dp.gatewayRuntime.tracing.enabled .Values.wso2.apk.dp.gatewayRuntime.tracing.configProperties }} - name: TRACING_ENABLED value: "{{ .Values.wso2.apk.dp.gatewayRuntime.tracing.enabled }}" @@ -164,10 +164,10 @@ spec: {{- else }} subPath: ca.crt {{- end }} - - name: common-controller-truststore-secret-volume + - name: adapter-truststore-secret-volume mountPath: /home/wso2/security/truststore/adapter.pem - {{- if and .Values.wso2.apk.dp.commonController.configs .Values.wso2.apk.dp.commonController.configs.tls }} - subPath: {{ .Values.wso2.apk.dp.commonController.configs.tls.certFilename | default "tls.crt" }} + {{- if and .Values.wso2.apk.dp.adapter.configs .Values.wso2.apk.dp.adapter.configs.tls }} + subPath: {{ .Values.wso2.apk.dp.adapter.configs.tls.certFilename | default "tls.crt" }} {{- else }} subPath: tls.crt {{- end }} @@ -224,12 +224,12 @@ spec: secretName: {{ template "apk-helm.resource.prefix" . }}-ratelimiter-server-cert {{- end }} defaultMode: 420 - - name: common-controller-truststore-secret-volume + - name: adapter-truststore-secret-volume secret: - {{- if and .Values.wso2.apk.dp.commonController.configs .Values.wso2.apk.dp.commonController.configs.tls }} - secretName: {{ .Values.wso2.apk.dp.commonController.configs.tls.secretName | default (printf "%s-adapter-server-cert" (include "apk-helm.resource.prefix" .)) }} + {{- if and .Values.wso2.apk.dp.adapter.configs .Values.wso2.apk.dp.adapter.configs.tls }} + secretName: {{ .Values.wso2.apk.dp.adapter.configs.tls.secretName | default (printf "%s-adapter-server-cert" (include "apk-helm.resource.prefix" .)) }} {{- else }} - secretName: {{ template "apk-helm.resource.prefix" . }}-common-controller-server-cert + secretName: {{ template "apk-helm.resource.prefix" . }}-adapter-server-cert {{- end }} defaultMode: 420 - name: router-truststore-secret-volume @@ -246,4 +246,4 @@ spec: secretName: {{ .Values.wso2.apk.dp.gatewayRuntime.tracing.configProperties.tls.secretName}} defaultMode: 420 {{ end }} -{{- end -}} +{{- end -}} \ No newline at end of file