Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix helm issue in CP apis #1805

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Fix helm issue in CP apis #1805

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92f51bb
Fix helm issue in CP apis
Krishanx92 Oct 6, 2023
fa8ca1a
Update backendjwt cr
Krishanx92 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions helm-charts/templates/control-plane/admin-ds/admin-domain-api-backendjwt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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"
type: "string"
value: "http://wso2.org/claims/enduser"
encoding: Base64
header: X-JWT-Assertion
signingAlgorithm: SHA256withRSA
tokenTTL: 3600
{{- end -}}
11 changes: 2 additions & 9 deletions helm-charts/templates/control-plane/admin-ds/admin-domain-api-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/templates/control-plane/admin-ds/admin-domain-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 30 additions & 0 deletions helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api-backendjwt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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"
type: "string"
value: "http://wso2.org/claims/enduser"
encoding: Base64
header: X-JWT-Assertion
signingAlgorithm: SHA256withRSA
tokenTTL: 3600
{{- end -}}
11 changes: 2 additions & 9 deletions helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/templates/control-plane/backoffice-ds/backoffice-domain-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 30 additions & 0 deletions helm-charts/templates/control-plane/devportal-ds/devportal-domain-api-backendjwt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# 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"
type: "string"
value: "http://wso2.org/claims/enduser"
encoding: Base64
header: X-JWT-Assertion
signingAlgorithm: SHA256withRSA
tokenTTL: 3600
{{- end -}}
11 changes: 2 additions & 9 deletions helm-charts/templates/control-plane/devportal-ds/devportal-domain-api-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/templates/control-plane/devportal-ds/devportal-domain-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading