Skip to content

Commit 85a082c

Browse files
migmartrimigmartri
authored
feat(chart): infer redirect schema (#84)
Signed-off-by: Miguel Martinez Trivino <[email protected]>
1 parent d953e4a commit 85a082c

File tree

5 files changed

+41
-37
lines changed

5 files changed

+41
-37
lines changed

‎deployment/chainloop/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: chainloop
33
description: Chainloop is an open source software supply chain control plane, a single source of truth for artifacts plus a declarative attestation crafting process.
44

55
type: application
6-
version: 1.1.0
6+
version: 1.1.1
77
appVersion: v0.8.99
88

99
dependencies:

‎deployment/chainloop/README.md‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
157157
| Name | Description | Value |
158158
| ------------------------------------------- | -------------------------------------------------------------------- | ----------- |
159159
| `secretsBackend.backend` | Secrets backend type ("vault" or "awsSecretManager") | `vault` |
160-
| `secretsBackend.secretPrefix` | Prefix that will be pre-pended to all secrets in the storage backend | `chainloop` |
160+
| `secretsBackend.secretPrefix` | Prefix that will be pre-pended to all secrets in the storage backend | `chainloop` |
161161
| `secretsBackend.vault.address` | Vault address | |
162162
| `secretsBackend.vault.token` | Vault authentication token | |
163163
| `secretsBackend.awsSecretManager.accessKey` | AWS Access KEY ID | |
@@ -195,13 +195,12 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
195195

196196
### Control Plane Authentication
197197

198-
| Name | Description | Value |
199-
| --------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------- |
200-
| `controlplane.auth.passphrase` | Passphrase used to sign the Auth Tokens generated by the controlplane. Leave empty for auto-generation | `""` |
201-
| `controlplane.auth.oidc.url` | Full authentication path, it should match the issuer URL of the Identity provider (IDp) | `""` |
202-
| `controlplane.auth.oidc.clientID` | OIDC IDp clientID | `""` |
203-
| `controlplane.auth.oidc.clientSecret` | OIDC IDp clientSecret | `""` |
204-
| `controlplane.auth.redirectURLScheme` | Schema that will be used during authentication | `https` |
198+
| Name | Description | Value |
199+
| ------------------------------------- | ------------------------------------------------------------------------------------------------------ | ----- |
200+
| `controlplane.auth.passphrase` | Passphrase used to sign the Auth Tokens generated by the controlplane. Leave empty for auto-generation | `""` |
201+
| `controlplane.auth.oidc.url` | Full authentication path, it should match the issuer URL of the Identity provider (IDp) | `""` |
202+
| `controlplane.auth.oidc.clientID` | OIDC IDp clientID | `""` |
203+
| `controlplane.auth.oidc.clientSecret` | OIDC IDp clientSecret | `""` |
205204

206205
### Control Plane Networking
207206

@@ -245,15 +244,17 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
245244

246245
### Controlplane Misc
247246

248-
| Name | Description | Value |
249-
| ------------------------------------------------------------ | ----------------------------- | ------- |
250-
| `controlplane.resources.limits` | Container resource limits | `{}` |
251-
| `controlplane.resources.requests` | Container resource requests | `{}` |
252-
| `controlplane.autoscaling.enabled` | Enable deployment autoscaling | `false` |
253-
| `controlplane.autoscaling.minReplicas` | Minimum number of replicas | `1` |
254-
| `controlplane.autoscaling.maxReplicas` | Maximum number of replicas | `100` |
255-
| `controlplane.autoscaling.targetCPUUtilizationPercentage` | Target CPU percentage | `80` |
256-
| `controlplane.autoscaling.targetMemoryUtilizationPercentage` | Target CPU memory | `80` |
247+
| Name | Description | Value |
248+
| ------------------------------------------------------------ | ---------------------------------- | ------- |
249+
| `controlplane.resources.limits.cpu` | Container resource limits CPU | `250m` |
250+
| `controlplane.resources.limits.memory` | Container resource limits memory | `512Mi` |
251+
| `controlplane.resources.requests.cpu` | Container resource requests CPU | `250m` |
252+
| `controlplane.resources.requests.memory` | Container resource requests memory | `512Mi` |
253+
| `controlplane.autoscaling.enabled` | Enable deployment autoscaling | `false` |
254+
| `controlplane.autoscaling.minReplicas` | Minimum number of replicas | `1` |
255+
| `controlplane.autoscaling.maxReplicas` | Maximum number of replicas | `100` |
256+
| `controlplane.autoscaling.targetCPUUtilizationPercentage` | Target CPU percentage | `80` |
257+
| `controlplane.autoscaling.targetMemoryUtilizationPercentage` | Target CPU memory | `80` |
257258

258259
### Artifact Content Addressable (CAS) API
259260

@@ -288,15 +289,17 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
288289

289290
### CAS Misc
290291

291-
| Name | Description | Value |
292-
| --------------------------------------------------- | ----------------------------- | ------- |
293-
| `cas.resources.limits` | Container resource limits | `{}` |
294-
| `cas.resources.requests` | Container resource requests | `{}` |
295-
| `cas.autoscaling.enabled` | Enable deployment autoscaling | `false` |
296-
| `cas.autoscaling.minReplicas` | Minimum number of replicas | `1` |
297-
| `cas.autoscaling.maxReplicas` | Maximum number of replicas | `100` |
298-
| `cas.autoscaling.targetCPUUtilizationPercentage` | Target CPU percentage | `80` |
299-
| `cas.autoscaling.targetMemoryUtilizationPercentage` | Target CPU memory | `80` |
292+
| Name | Description | Value |
293+
| --------------------------------------------------- | ---------------------------------- | ------- |
294+
| `cas.resources.limits.cpu` | Container resource limits CPU | `250m` |
295+
| `cas.resources.limits.memory` | Container resource limits memory | `512Mi` |
296+
| `cas.resources.requests.cpu` | Container resource requests CPU | `250m` |
297+
| `cas.resources.requests.memory` | Container resource requests memory | `512Mi` |
298+
| `cas.autoscaling.enabled` | Enable deployment autoscaling | `false` |
299+
| `cas.autoscaling.minReplicas` | Minimum number of replicas | `1` |
300+
| `cas.autoscaling.maxReplicas` | Maximum number of replicas | `100` |
301+
| `cas.autoscaling.targetCPUUtilizationPercentage` | Target CPU percentage | `80` |
302+
| `cas.autoscaling.targetMemoryUtilizationPercentage` | Target CPU memory | `80` |
300303

301304
### Dependencies
302305

‎deployment/chainloop/templates/_helpers.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ NOTE: Load balancer service type is not supported
9999
{{- $ingress := .Values.controlplane.ingress }}
100100

101101
{{- if (and $ingress $ingress.enabled $ingress.hostname) }}
102-
{{- $ingress.hostname }}
102+
{{- printf "%s://%s" (ternary "https" "http" $ingress.tls ) $ingress.hostname }}
103103
{{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }}
104-
{{- printf "localhost:%s" $service.nodePorts.http }}
104+
{{- printf "http://localhost:%s" $service.nodePorts.http }}
105105
{{- else -}}
106106
null
107107
{{- end -}}

‎deployment/chainloop/templates/controlplane/config.configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data:
1818
http:
1919
addr: 0.0.0.0:8000
2020
timeout: 1s
21-
external_addr: {{ include "chainloop.controlplane.external_url" . }}
21+
external_url: {{ include "chainloop.controlplane.external_url" . }}
2222
http_metrics:
2323
addr: 0.0.0.0:5000
2424
grpc:

‎deployment/chainloop/values.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,10 @@ controlplane:
139139
## @param controlplane.auth.oidc.url Full authentication path, it should match the issuer URL of the Identity provider (IDp)
140140
## @param controlplane.auth.oidc.clientID OIDC IDp clientID
141141
## @param controlplane.auth.oidc.clientSecret OIDC IDp clientSecret
142-
## @param controlplane.auth.redirectURLScheme Schema that will be used during authentication
143142
oidc:
144143
url: ""
145144
clientID: ""
146145
clientSecret: ""
147-
# TODO: look into automatically inference https://github.com/chainloop-dev/chainloop/issues/61
148-
redirectURLScheme: "https"
149146

150147
## @section Control Plane Networking
151148
service:
@@ -379,8 +376,10 @@ controlplane:
379376
## @section Controlplane Misc
380377

381378
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
382-
## @param controlplane.resources.limits Container resource limits
383-
## @param controlplane.resources.requests Container resource requests
379+
## @param controlplane.resources.limits.cpu Container resource limits CPU
380+
## @param controlplane.resources.limits.memory Container resource limits memory
381+
## @param controlplane.resources.requests.cpu Container resource requests CPU
382+
## @param controlplane.resources.requests.memory Container resource requests memory
384383
resources:
385384
# GKE auto-pilot min
386385
# https://cloud.google.com/kubernetes-engine/docs/concepts/autopilot-resource-requests#min-max-requests
@@ -550,8 +549,10 @@ cas:
550549

551550
## @section CAS Misc
552551
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
553-
## @param cas.resources.limits Container resource limits
554-
## @param cas.resources.requests Container resource requests
552+
## @param cas.resources.limits.cpu Container resource limits CPU
553+
## @param cas.resources.limits.memory Container resource limits memory
554+
## @param cas.resources.requests.cpu Container resource requests CPU
555+
## @param cas.resources.requests.memory Container resource requests memory
555556
resources:
556557
# GKE auto-pilot min
557558
# https://cloud.google.com/kubernetes-engine/docs/concepts/autopilot-resource-requests#min-max-requests

0 commit comments

Comments
 (0)