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.

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 helms #14

Merged
merged 1 commit into from
Jan 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 2 additions & 32 deletions charts/ror-webapp/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: ror-web-cm-config
name: {{ include "ror-webapp.fullname" . }}-cm-config
data:
config.json: |
{
"auth": {
"issuer": "{{ .Values.web.authUrl }}",
"clientId": "ror.sky.test.nhn.no",
"clientId": "{{ .Values.web.authClientId}}",
"redirectUri": "/auth/callback",
"scope": "profile email groups",
"response_type": "id_token token",
Expand All @@ -26,33 +26,3 @@ data:
"timeout": 30000
}
}

---
apiVersion: v1
kind: ConfigMap
metadata:
name: ror-web-cm-config2
data:
config.json: |
{
"auth": {
"issuer": "{{ .Values.web.authUrl }}",
"clientId": "ror.nhn.no",
"redirectUri": "/auth/callback",
"scope": "profile email groups",
"response_type": "id_token token",
"requireHttps": true,
"strictDiscoveryDocumentValidation": true
},
"regex": {
"forms": "^[@()\\/:?\\r\\n.,a-zA-Z æøåÆØÅ0-9_-]+$"
},
"rowsPerPage": [10, 25, 50, 75, 100],
"rows": 25,
"rorApi": "{{ .Values.web.apiUrl2 }}",
"sse": {
"postfixUrl": "/v1/events/listen",
"method": "GET",
"timeout": 30000
}
}
2 changes: 1 addition & 1 deletion charts/ror-webapp/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ spec:
volumes:
- name: json-configmap-volume
configMap:
name: ror-web-cm-config2
name: {{ include "ror-webapp.fullname" . }}-cm-config
- name: tmp-volume
emptyDir: {}
76 changes: 21 additions & 55 deletions charts/ror-webapp/templates/ingress-helsenett.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,28 @@ kind: Ingress
metadata:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
name: {{ include "ror-webapp.fullname" . }}helm-ingress
name: {{ include "ror-webapp.fullname" . }}-ingress
spec:
ingressClassName: avi-ingress-class-helsenett
rules:
- host: {{ .Values.web.host }}
http:
paths:
- backend:
service:
name: {{ include "ror-webapp.fullname" . }}
port:
number: {{ .Values.service.port }}
path: {{ .Values.ingress.path }}
pathType: {{ .Values.ingress.pathType }}
- host: {{ .Values.web.host2 }}
http:
paths:
- backend:
service:
name: {{ include "ror-webapp.fullname" . }}
port:
number: {{ .Values.service.port }}
path: {{ .Values.ingress.path }}
pathType: {{ .Values.ingress.pathType }}
{{- $outer := . -}}
{{- range $idx, $host := .Values.web.hosts }}
{{- with $outer }}
- host: {{ $host }}
http:
paths:
- backend:
service:
name: {{ include "ror-webapp.fullname" . }}
port:
number: {{ .Values.service.port }}
path: {{ .Values.ingress.path }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
{{- end }}
tls:
- hosts:
- {{ .Values.web.host }}
secretName: nhn-ror-webapp-tls
- hosts:
- {{ .Values.web.host2 }}
secretName: nhn-ror-webapp-tls

---
apiVersion: ako.vmware.com/v1alpha1
kind: HostRule
metadata:
name: admin-allow-dcn-paw
namespace: {{ .Release.namespace}}
spec:
virtualhost:
datascripts:
- expose-nhn-office-isp
- expose-nhn-office-client
- expose-nhn-office-devops
- expose-nsg-amk-paws
- expose-nhn-dc-any
- expose-nsg-cloud-paws
- expose-nsg-container-paws
- expose-nsg-soc-paws
- expose-nsg-mon-paws
- expose-nhn-office-devops
- expose-nsg-esm-paws
- bottom-deny-rule
fqdn: ror.sky.test.nhn.no
analyticsProfile: NHN-System-Analytics-Profile
analyticsPolicy:
fullClientLogs:
enabled: false
throttle: DISABLED
- hosts:
{{- range $idx, $host := .Values.web.hosts }}
- {{ $host }}
{{- end }}
secretName: {{ include "ror-webapp.fullname" . }}-tls
9 changes: 5 additions & 4 deletions charts/ror-webapp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
# Declare variables to be passed into your templates.
enabled: true
web:
host: ror.sky.test.nhn.no
host2: ror.nhn.no
apiUrl: https://api.ror.sky.test.nhn.no
apiUrl2: https://api.ror.nhn.no
hosts:
- ror.sky.test.nhn.no
- ror.nhn.no
apiUrl: https://api.ror.nhn.no
authUrl: https://auth.sky.nhn.no/dex
authClientId: ror.nhn.no
replicaCount: 3
image:
repository: ghcr.io/norskhelsenett/ror-webapp
Expand Down
Loading