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 webterminal helm install #1933

Merged
merged 2 commits into from
Feb 10, 2025
Merged

fix webterminal helm install #1933

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
6516aed
fix webterminal helm install
Lappihuan Feb 9, 2025
ef5240c
move certificates into own template
Lappihuan Feb 10, 2025
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
40 changes: 35 additions & 5 deletions configuration/configuration/templates/webterminal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,38 @@ type: Opaque
stringData:
values.yaml: |-
global:
runtime:
certificate:
certManager:
enabled: true
issuerName: gardener-ca
deployment:
createNamespace: false
virtualGarden:
enabled: true
controller:
manager:
config:
server:
metrics:
tls:
crt: |
-----BEGIN CERTIFICATE-----
lotharbach marked this conversation as resolved.
Show resolved Hide resolved
...
-----END CERTIFICATE-----
key: |
-----BEGIN RSA PRIVATE KEY-----
...
-----END RSA PRIVATE
admission:
config:
server:
webhooks:
caBundle: |
-----BEGIN CERTIFICATE-----
...
-----END CERTIFICATE-----
tls:
crt: |
-----BEGIN CERTIFICATE-----
...
-----END CERTIFICATE-----
key: |
-----BEGIN RSA PRIVATE KEY-----
...
-----END RSA PRIVATE
46 changes: 46 additions & 0 deletions gardener/certificates/templates/cert-manager-ca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,3 +203,49 @@ spec:
- gardener-admission-controller.garden.svc
issuerRef:
name: gardener-ca
---
lotharbach marked this conversation as resolved.
Show resolved Hide resolved
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: terminal-admission-controller-cert
namespace: flux-system
spec:
secretName: terminal-admission-controller-cert
commonName: terminal-admission-controller.terminal-system.svc.cluster.local
duration: 87600h # 10 years
usages:
- server auth
dnsNames:
- terminal-admission-controller
- terminal-admission-controller.terminal-system
- terminal-admission-controller.terminal-system.svc
- terminal-admission-controller.terminal-system.svc.cluster
- terminal-admission-controller.terminal-system.svc.cluster.local
issuerRef:
name: gardener-ca
privateKey:
algorithm: RSA
size: 3072
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: terminal-metrics-cert
namespace: flux-system
spec:
secretName: terminal-metrics-cert
commonName: terminal-metrics.terminal-system.svc.cluster.local
duration: 87600h # 10 years
usages:
- server auth
dnsNames:
- terminal-metrics
- terminal-metrics.terminal-system
- terminal-metrics.terminal-system.svc
- terminal-metrics.terminal-system.svc.cluster
- terminal-metrics.terminal-system.svc.cluster.local
issuerRef:
name: gardener-ca
privateKey:
algorithm: RSA
size: 3072
80 changes: 75 additions & 5 deletions gardener/webterminal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
dependsOn:
- name: configuration
- name: gardener-application
targetNamespace: flux-system
targetNamespace: terminal-system
lotharbach marked this conversation as resolved.
Show resolved Hide resolved
interval: 1m
chart:
spec:
Expand All @@ -23,15 +23,54 @@ spec:
remediation:
retries: 3
createNamespace: true
values:
utils-templates:
enabled: true
valuesFrom:
- kind: Secret
name: webterminal-base-values
optional: false
- kind: Secret
name: webterminal-values-0
optional: true
- kind: Secret
name: webterminal-values-1
optional: true
- kind: Secret
name: webterminal-values-2
optional: true
- kind: Secret
name: webterminal-values
optional: true
valuesKey: enabled
targetPath: terminal-controller-manager-runtime.enabled

- kind: Secret
name: gardener-internal-kubeconfig
valuesKey: value
targetPath: global.controller.manager.kubeconfig

- kind: Secret
name: terminal-metrics-cert
valuesKey: tls.key
targetPath: global.controller.manager.config.server.metrics.tls.key
- kind: Secret
name: terminal-metrics-cert
valuesKey: tls.crt
targetPath: global.controller.manager.config.server.metrics.tls.crt
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: ca.crt
targetPath: global.admission.config.server.webhooks.caBundle
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: tls.key
targetPath: global.admission.config.server.webhooks.tls.key
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: tls.crt
targetPath: global.admission.config.server.webhooks.tls.crt

---
apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease
Expand All @@ -42,7 +81,7 @@ spec:
dependsOn:
- name: configuration
- name: terminal-controller-manager-runtime
targetNamespace: flux-system
targetNamespace: terminal-system
kubeConfig:
secretRef:
name: gardener-internal-kubeconfig
Expand All @@ -60,14 +99,45 @@ spec:
remediation:
retries: 3
createNamespace: true
values:
utils-templates:
enabled: true
valuesFrom:
- kind: Secret
name: terminal-webhook-server-cert
valuesKey: tls.crt
targetPath: global.application.certificate.caBundle
name: webterminal-base-values
optional: false
- kind: Secret
name: webterminal-values-0
optional: true
- kind: Secret
name: webterminal-values-1
optional: true
- kind: Secret
name: webterminal-values-2
optional: true
- kind: Secret
name: webterminal-values
optional: true
valuesKey: enabled
targetPath: terminal-controller-manager-application.enabled

- kind: Secret
name: terminal-metrics-cert
valuesKey: tls.key
targetPath: global.controller.manager.config.server.metrics.tls.key
- kind: Secret
name: terminal-metrics-cert
valuesKey: tls.crt
targetPath: global.controller.manager.config.server.metrics.tls.crt
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: ca.crt
targetPath: global.admission.config.server.webhooks.caBundle
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: tls.key
targetPath: global.admission.config.server.webhooks.tls.key
- kind: Secret
name: terminal-admission-controller-cert
valuesKey: tls.crt
targetPath: global.admission.config.server.webhooks.tls.crt