Merge pull request #1805 from Krishanx92/new1.1.0

Fix helm issue in CP apis

helm-charts/templates/control-plane/admin-ds/admin-domain-api-backendjwt.yaml

@@ -0,0 +1,29 @@
+# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+{{- if .Values.wso2.apk.cp.enabled }}
+apiVersion: dp.wso2.com/v1alpha1
+kind: BackendJWT
+metadata:
+  name: {{ template "apk-helm.resource.prefix" . }}-admin-backend-jwt
+spec:
+  customClaims:
+    - claim: "admin"
+      value: "http://wso2.org/claims/enduser"
+  encoding: Base64
+  header: X-JWT-Assertion
+  signingAlgorithm: SHA256withRSA
+  tokenTTL: 3600
+{{- end -}}

helm-charts/templates/control-plane/admin-ds/admin-domain-api-policy.yaml

@@ -21,15 +21,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   override:
-    backendJwtToken:
-      enabled: true
-      encoding: "base64"
-      signingAlgorithm: "SHA256withRSA"
-      header: "X-JWT-Assertion"
-      tokenTTL: 3600
-      customClaims:
-        - claim: "admin"
-          value: "http://wso2.org/claims/enduser"
+    backendJwtPolicy:
+      name: {{ template "apk-helm.resource.prefix" . }}-admin-backend-jwt
   targetRef:
     group: "gateway.networking.k8s.io"
     kind: "API"

helm-charts/templates/control-plane/admin-ds/admin-domain-api.yaml

@@ -27,7 +27,7 @@ spec:
   apiType: "REST"
   apiVersion: "1.0.0"
   basePath: "/api/admin/1.0.0"
-  organization: "carbon.super"
+  organization: "apk-system"
   production:
     - httpRouteRefs:
       - {{ template "apk-helm.resource.prefix" . }}-admin-ds-httproute-1

helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api-backendjwt.yaml

@@ -0,0 +1,29 @@
+# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+{{- if .Values.wso2.apk.cp.enabled }}
+apiVersion: dp.wso2.com/v1alpha1
+kind: BackendJWT
+metadata:
+  name: {{ template "apk-helm.resource.prefix" . }}-backoffice-backend-jwt
+spec:
+  customClaims:
+    - claim: "admin"
+      value: "http://wso2.org/claims/enduser"
+  encoding: Base64
+  header: X-JWT-Assertion
+  signingAlgorithm: SHA256withRSA
+  tokenTTL: 3600
+{{- end -}}

helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api-policy.yaml

@@ -21,15 +21,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   override:
-    backendJwtToken:
-      enabled: true
-      encoding: "base64"
-      signingAlgorithm: "SHA256withRSA"
-      header: "X-JWT-Assertion"
-      tokenTTL: 3600
-      customClaims:
-        - claim: "admin"
-          value: "http://wso2.org/claims/enduser"
+    backendJwtPolicy:
+      name: {{ template "apk-helm.resource.prefix" . }}-backoffice-backend-jwt
   targetRef:
     group: "gateway.networking.k8s.io"
     kind: "API"

helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api.yaml

@@ -28,7 +28,7 @@ spec:
   apiType: "REST"
   apiVersion: "1.0.0"
   basePath: "/api/backoffice/1.0.0"
-  organization: "carbon.super"
+  organization: "apk-system"
   production:
     - httpRouteRefs:
       - {{ template "apk-helm.resource.prefix" . }}-backoffice-ds-httproute-1

helm-charts/templates/control-plane/devportal-ds/devportal-domain-api-backendjwt.yaml

@@ -0,0 +1,29 @@
+# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com) All Rights Reserved.
+#
+# WSO2 LLC. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+{{- if .Values.wso2.apk.cp.enabled }}
+apiVersion: dp.wso2.com/v1alpha1
+kind: BackendJWT
+metadata:
+  name: {{ template "apk-helm.resource.prefix" . }}-devportal-backend-jwt
+spec:
+  customClaims:
+    - claim: "admin"
+      value: "http://wso2.org/claims/enduser"
+  encoding: Base64
+  header: X-JWT-Assertion
+  signingAlgorithm: SHA256withRSA
+  tokenTTL: 3600
+{{- end -}}

helm-charts/templates/control-plane/devportal-ds/devportal-domain-api-policy.yaml

@@ -21,15 +21,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   override:
-    backendJwtToken:
-      enabled: true
-      encoding: "base64"
-      signingAlgorithm: "SHA256withRSA"
-      header: "X-JWT-Assertion"
-      tokenTTL: 3600
-      customClaims:
-        - claim: "admin"
-          value: "http://wso2.org/claims/enduser"
+    backendJwtPolicy:
+      name: {{ template "apk-helm.resource.prefix" . }}-devportal-backend-jwt
   targetRef:
     group: "gateway.networking.k8s.io"
     kind: "API"

helm-charts/templates/control-plane/devportal-ds/devportal-domain-api.yaml

@@ -27,7 +27,7 @@ spec:
   apiType: "REST"
   apiVersion: "1.0.0"
   basePath: "/api/devportal/1.0.0"
-  organization: "carbon.super"
+  organization: "apk-system"
   production:
     - httpRouteRefs:
       - {{ template "apk-helm.resource.prefix" . }}-devportal-ds-httproute-1