Skip to content

Commit 7ea345c

Browse files
authored
chore: update default values for components (#274)
* chore: update default values for components --------- On-behalf-of: @SAP [email protected] Signed-off-by: Angel Kafazov <[email protected]>
1 parent 10aa800 commit 7ea345c

File tree

4 files changed

+66
-7
lines changed

4 files changed

+66
-7
lines changed

charts/platform-mesh-operator-components/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: platform-mesh-operator-components
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.25.0
5+
version: 0.26.0
66
appVersion: "0.0.0"

charts/platform-mesh-operator-components/README.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ A Helm chart for Kubernetes
6464
| services.infra.values.istio.passThrough.gateway.port | string | `"{{ .Values.port }}"` | |
6565
| services.infra.values.istio.passThrough.gateway.protocol | string | `"HTTPS"` | |
6666
| services.infra.values.kcp.image.tag | string | `"8265c399b"` | |
67+
| services.infra.values.kcp.rootShard.extraArgs[0] | string | `"--feature-gates=WorkspaceAuthentication=true"` | |
68+
| services.infra.values.kcp.rootShard.extraArgs[1] | string | `"--shard-virtual-workspace-url=https://kcp.api.{{ .Values.baseDomainPort }}"` | |
69+
| services.infra.values.kcp.webhook.enabled | bool | `true` | |
70+
| services.infra.values.keycloak.crossplane.clients.welcome.validRedirectUris[0] | string | `"https://{{ .Values.baseDomainPort }}/callback*"` | |
6771
| services.infra.values.keycloak.istio.virtualservice.hosts[0] | string | `"{{ .Values.baseDomain }}"` | |
6872
| services.istio-base.chart | string | `"base"` | |
6973
| services.istio-base.driftDetectionMode | string | `"disabled"` | |
@@ -107,6 +111,7 @@ A Helm chart for Kubernetes
107111
| services.kcp-operator.imageResource.labels.infra | string | `"true"` | |
108112
| services.kcp-operator.imageResource.name | string | `"kcp-image"` | |
109113
| services.kcp-operator.targetNamespace | string | `"kcp-operator"` | |
114+
| services.kcp-operator.values.image.tag | string | `"v0.3.0"` | |
110115
| services.keycloak.dependsOn[0].name | string | `"istio-istiod"` | |
111116
| services.keycloak.dependsOn[0].namespace | string | `"default"` | |
112117
| services.keycloak.enabled | bool | `true` | |
@@ -127,6 +132,12 @@ A Helm chart for Kubernetes
127132
| services.keycloak.values.postgresql.auth.username | string | `"keycloak"` | postgresql username |
128133
| services.keycloak.values.postgresql.nameOverride | string | `"postgresql-keycloak"` | postgresql name override |
129134
| services.keycloak.values.postgresql.primary.resourcesPreset | string | `"none"` | primary postgresql resources preset |
135+
| services.keycloak.values.resources.limits.cpu | string | `"2"` | |
136+
| services.keycloak.values.resources.limits.ephemeral-storage | string | `"2Gi"` | |
137+
| services.keycloak.values.resources.limits.memory | string | `"2Gi"` | |
138+
| services.keycloak.values.resources.requests.cpu | string | `"750m"` | |
139+
| services.keycloak.values.resources.requests.ephemeral-storage | string | `"50Mi"` | |
140+
| services.keycloak.values.resources.requests.memory | string | `"1Gi"` | |
130141
| services.kubernetes-graphql-gateway.dependsOn[0].name | string | `"istio-istiod"` | |
131142
| services.kubernetes-graphql-gateway.dependsOn[0].namespace | string | `"default"` | |
132143
| services.kubernetes-graphql-gateway.enabled | bool | `true` | |
@@ -207,7 +218,8 @@ A Helm chart for Kubernetes
207218
| services.portal.values.frontendPort | string | `"{{ .Values.port }}"` | |
208219
| services.portal.values.http.protocol | string | `"https"` | |
209220
| services.portal.values.kcp.kubeconfigSecret | string | `"portal-kubeconfig"` | |
210-
| services.portal.values.virtualService.hosts | bool | `false` | |
221+
| services.portal.values.virtualService.hosts[0] | string | `"{{ .Values.baseDomain }}"` | |
222+
| services.portal.values.virtualService.hosts[1] | string | `"*.{{ .Values.baseDomain }}"` | |
211223
| services.rebac-authz-webhook.dependsOn[0].name | string | `"istio-istiod"` | |
212224
| services.rebac-authz-webhook.dependsOn[0].namespace | string | `"default"` | |
213225
| services.rebac-authz-webhook.enabled | bool | `true` | |
@@ -223,7 +235,7 @@ A Helm chart for Kubernetes
223235
| services.security-operator.values.crds.enabled | bool | `false` | |
224236
| services.security-operator.values.fga.inviteKeycloakBaseUrl | string | `"https://{{ .Values.baseDomainPort }}/keycloak"` | |
225237
| services.security-operator.values.fga.target | string | `"openfga.platform-mesh-system.svc.cluster.local:8081"` | |
226-
| services.security-operator.values.initializer.baseDomain | string | `"{{ .Values.baseDomain }}"` | |
238+
| services.security-operator.values.initializer.baseDomain | string | `"{{ .Values.baseDomainPort }}"` | |
227239
| services.security-operator.values.initializer.kubeconfigSecret | string | `"security-initializer-kubeconfig"` | |
228240
| services.security-operator.values.kubeconfigSecret | string | `"security-operator-kubeconfig"` | |
229241
| services.security-operator.values.log.level | string | `"debug"` | |

charts/platform-mesh-operator-components/tests/__snapshot__/application_test.yaml.snap

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,18 @@ it should render the application manifests:
149149
kcp:
150150
image:
151151
tag: 8265c399b
152+
rootShard:
153+
extraArgs:
154+
- --feature-gates=WorkspaceAuthentication=true
155+
- --shard-virtual-workspace-url=https://kcp.api.example.com:8443
156+
webhook:
157+
enabled: true
152158
keycloak:
159+
crossplane:
160+
clients:
161+
welcome:
162+
validRedirectUris:
163+
- https://example.com:8443/callback*
153164
istio:
154165
virtualservice:
155166
hosts:
@@ -265,7 +276,9 @@ it should render the application manifests:
265276
releaseName: kcp-operator
266277
targetNamespace: kcp-operator
267278
timeout: 15m
268-
values: null
279+
values:
280+
image:
281+
tag: v0.3.0
269282
10: |
270283
apiVersion: helm.toolkit.fluxcd.io/v2
271284
kind: HelmRelease
@@ -319,6 +332,15 @@ it should render the application manifests:
319332
nameOverride: postgresql-keycloak
320333
primary:
321334
resourcesPreset: none
335+
resources:
336+
limits:
337+
cpu: "2"
338+
ephemeral-storage: 2Gi
339+
memory: 2Gi
340+
requests:
341+
cpu: 750m
342+
ephemeral-storage: 50Mi
343+
memory: 1Gi
322344
11: |
323345
apiVersion: helm.toolkit.fluxcd.io/v2
324346
kind: HelmRelease
@@ -495,7 +517,7 @@ it should render the application manifests:
495517
inviteKeycloakBaseUrl: https://example.com:8443/keycloak
496518
target: openfga.platform-mesh-system.svc.cluster.local:8081
497519
initializer:
498-
baseDomain: example.com
520+
baseDomain: example.com:8443
499521
kubeconfigSecret: security-initializer-kubeconfig
500522
kubeconfigSecret: security-operator-kubeconfig
501523
log:

charts/platform-mesh-operator-components/values.yaml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ services:
133133
inviteKeycloakBaseUrl: "https://{{ .Values.baseDomainPort }}/keycloak"
134134
initializer:
135135
kubeconfigSecret: security-initializer-kubeconfig
136-
baseDomain: "{{ .Values.baseDomain }}"
136+
baseDomain: "{{ .Values.baseDomainPort }}"
137137
kubeconfigSecret: security-operator-kubeconfig
138138
log:
139139
level: debug
@@ -169,6 +169,12 @@ services:
169169
image:
170170
# FIXME: this is a temporary fix until we have support for the latest version
171171
tag: 8265c399b
172+
rootShard:
173+
extraArgs:
174+
- --feature-gates=WorkspaceAuthentication=true
175+
- --shard-virtual-workspace-url=https://kcp.api.{{ .Values.baseDomainPort }}
176+
webhook:
177+
enabled: true
172178
istio:
173179
main:
174180
gateway:
@@ -195,6 +201,11 @@ services:
195201
virtualservice:
196202
hosts:
197203
- "{{ .Values.baseDomain }}"
204+
crossplane:
205+
clients:
206+
welcome:
207+
validRedirectUris:
208+
- "https://{{ .Values.baseDomainPort }}/callback*"
198209
kcp-operator:
199210
imageResource:
200211
name: kcp-image
@@ -205,6 +216,9 @@ services:
205216
enabled: true
206217
helmRepo: true
207218
targetNamespace: kcp-operator
219+
values:
220+
image:
221+
tag: "v0.3.0"
208222
keycloak:
209223
enabled: true
210224
dependsOn:
@@ -216,6 +230,15 @@ services:
216230
- name: github
217231
security:
218232
allowInsecureImages: true
233+
resources:
234+
limits:
235+
cpu: "2"
236+
ephemeral-storage: 2Gi
237+
memory: 2Gi
238+
requests:
239+
cpu: 750m
240+
ephemeral-storage: 50Mi
241+
memory: 1Gi
219242
image:
220243
registry: ghcr.io/platform-mesh
221244
repository: upstream-images/keycloak
@@ -375,7 +398,9 @@ services:
375398
clientId: "welcome"
376399
baseDomain: "{{ .Values.baseDomain }}"
377400
virtualService:
378-
hosts: false
401+
hosts:
402+
- "{{ .Values.baseDomain }}"
403+
- "*.{{ .Values.baseDomain }}"
379404
cookieDomain: "{{ .Values.baseDomain }}"
380405
extraEnvVars:
381406
- name: DEFAULT_PORTAL_CONTEXT_CRD_GATEWAY_API_URL

0 commit comments

Comments
 (0)