Skip to content

Commit

Permalink
Merge branch 'chore/move-charts' into chore/move-keycloak-chart
Browse files Browse the repository at this point in the history
  • Loading branch information
akafazov committed Nov 30, 2024
2 parents 0be2513 + 35c0892 commit 2e1409a
Show file tree
Hide file tree
Showing 21 changed files with 66 additions and 343 deletions.
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ tasks:
deps:
- task: setup:helm-docs
cmds:
- "{{.LOCAL_BIN}}/helm-docs --chart-search-root charts/ --template-files=README.md.gotmpl --template-files=./_templates.gotmpl"
- "{{.LOCAL_BIN}}/helm-docs --chart-search-root charts/ --template-files=README.md.gotmpl"
18 changes: 0 additions & 18 deletions charts/account-operator-crds/README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
# account-operator-crds

A Helm chart for Kubernetes

![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| kcp.enabled | bool | `false` | Enable KCP |

# account-operator-crds

![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)

A Helm chart for Kubernetes
Expand Down
46 changes: 0 additions & 46 deletions charts/account-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,5 @@
# account-operator

A Helm chart for Kubernetes

![Version: 0.4.21](https://img.shields.io/badge/Version-0.4.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.106.0](https://img.shields.io/badge/AppVersion-0.106.0-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| crds.enabled | bool | `true` | Enable CRDs |
| deployment.specTemplate.annotations | object | `{}` | The annotations for the deployment |
| deployment.specTemplate.labels | object | `{}` | The labels for the deployment |
| image.name | string | `"ghcr.io/openmfp/account-operator"` | The image repository |
| image.tag | string | `"latest"` | The image tag |
| kcp | object | `{"enabled":false,"virtualWorkspaceUrl":""}` | The KCP configuration |
| kcp.enabled | bool | `false` | Enable KCP |
| kcp.virtualWorkspaceUrl | string | `""` | The URL for the virtual workspace |
| kubeconfigSecret | string | `""` | The secret for kubeconfig |
| logLevel | string | `"warn"` | The log level |
| security.mountServiceAccountToken | bool | `false` | Mount the service account token |
| subroutines.extension.enabled | bool | `true` | Enable extension subroutines |
| subroutines.extensionReady.enabled | bool | `true` | Enable extension ready subroutines |
| subroutines.fga.creatorRelation | string | `"owner"` | The creator relation for FGA |
| subroutines.fga.enabled | bool | `true` | Enable FGA subroutines |
| subroutines.fga.grpcAddr | string | `""` | The gRPC address for FGA |
| subroutines.fga.objectType | string | `"account"` | The object type for FGA |
| subroutines.fga.parentRelation | string | `"parent"` | The parent relation for FGA |
| subroutines.fga.rootNamespace | string | `"openmfp-root"` | The root namespace for FGA |
| subroutines.namespace.enabled | bool | `true` | Enable namespace subroutines |
| webhooks.certDir | string | `"/certs"` | The directory for webhook certificates |
| webhooks.enabled | bool | `false` | Enable webhooks |

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| file://../account-operator-crds | account-operator-crds | 0.1.6 |
| file://../common | common | 0.1.5 |

# account-operator

![Version: 0.4.21](https://img.shields.io/badge/Version-0.4.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.106.0](https://img.shields.io/badge/AppVersion-0.106.0-informational?style=flat-square)

A Helm chart for Kubernetes
Expand Down
56 changes: 9 additions & 47 deletions charts/common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@ The `common` chart is a library of common resources that are shared across all o
The values in the `defaults:` section can be reused from other charts by using the lookup function "common.getKeyValue". It implements lookup on three levels:

1. Looks for `keyOverride` in the chart's values.yaml
2. Looks for `global.key` in the chart's values.yaml
3. Uses the `common.defaults.key` value from the table below.
2. Looks for `global.key` in the chart's or parent chart's values.yaml
3. Uses the `key` in the chart's values.yaml
4. Uses the `common.defaults.key` value from the table below.

1 has precendence over 2 over 3 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.
1 has precendence over 2 over 3 over 4 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.

Example
```
1) .Values.deployment.resources.limits.memoryOveride = 2048MB
2) .Values.global.deployment.resources.limits.memory = 1024MB
3) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
1) .Values.deployment.resources.limits.memoryOveride = 4096MB
2) .Values.global.deployment.resources.limits.memory = 2048MB
3) .Values.deployment.resources.limits.memory = 1024MB
4) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
```

| Key | Type | Default | Description |
Expand Down Expand Up @@ -52,44 +54,4 @@ Example
| defaults.securityContext.runAsGroup | int | `3000` | group id to run the container |
| defaults.securityContext.runAsUser | int | `1000` | user id to run the container |

# common

A Helm chart for Kubernetes

![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| defaults.certManager.enabled | bool | `false` | toggle to enable/disable cert-manager |
| defaults.deployment.maxSurge | int | `5` | maxSurge |
| defaults.deployment.maxUnavailable | int | `0` | maxUnavailable |
| defaults.deployment.resources.limits | object | `{"cpu":"100m","memory":"512Mi"}` | cpu and memory limits for the deployment |
| defaults.deployment.resources.requests | object | `{"cpu":"40m","memory":"50Mi"}` | cpu and memory requests for the deployment |
| defaults.deployment.revisionHistoryLimit | int | `3` | deployment revision history limit |
| defaults.deployment.strategy | string | `"RollingUpdate"` | deployment strategy |
| defaults.externalSecrets.enabled | bool | `true` | toggle to enable/disable external-secrets |
| defaults.health.liveness | object | `{"failureThreshold":1,"path":"/healthz"}` | liveness probe parameters |
| defaults.health.periodSeconds | int | `10` | health period |
| defaults.health.port | int | `8081` | health port |
| defaults.health.readiness | object | `{"initialDelaySeconds":5,"path":"/readyz","periodSeconds":10}` | readiness probe parameters |
| defaults.health.startup | object | `{"failureThreshold":30,"path":"/readyz"}` | startup probe parameters |
| defaults.imagePullPolicy | string | `"Always"` | imagePullPolicy is the policy to use when pulling images for all charts |
| defaults.imagePullSecret | string | `"github"` | imagePullSecret is the name of the secret that holds the docker registry credentials |
| defaults.istio.enabled | bool | `false` | toggle to enable/disable istio |
| defaults.istio.gateway.name | string | `"gateway"` | name of the gateway |
| defaults.istio.https.enabled | bool | `true` | toggle to enable/disable https |
| defaults.istio.quitSidecar | bool | `true` | toggle sidecar injection |
| defaults.metrics.port | int | `8080` | metrics port |
| defaults.port | int | `8080` | service port |
| defaults.securityContext.fsGroup | int | `2000` | fsGroup id to run the container |
| defaults.securityContext.runAsGroup | int | `3000` | group id to run the container |
| defaults.securityContext.runAsUser | int | `1000` | user id to run the container |

S
14 changes: 8 additions & 6 deletions charts/common/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,18 @@ The `common` chart is a library of common resources that are shared across all o
The values in the `defaults:` section can be reused from other charts by using the lookup function "common.getKeyValue". It implements lookup on three levels:

1. Looks for `keyOverride` in the chart's values.yaml
2. Looks for `global.key` in the chart's values.yaml
3. Uses the `common.defaults.key` value from the table below.
2. Looks for `global.key` in the chart's or parent chart's values.yaml
3. Uses the `key` in the chart's values.yaml
4. Uses the `common.defaults.key` value from the table below.

1 has precendence over 2 over 3 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.
1 has precendence over 2 over 3 over 4 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.

Example
```
1) .Values.deployment.resources.limits.memoryOveride = 2048MB
2) .Values.global.deployment.resources.limits.memory = 1024MB
3) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
1) .Values.deployment.resources.limits.memoryOveride = 4096MB
2) .Values.global.deployment.resources.limits.memory = 2048MB
3) .Values.deployment.resources.limits.memory = 1024MB
4) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
```

{{ template "chart.valuesTable" . }}
Expand Down
Binary file modified charts/common/test-chart/charts/common-0.1.5.tgz
Binary file not shown.
27 changes: 18 additions & 9 deletions charts/example-content/README.MD
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
# Helm chart of the jukebox
# example-content

## Execute the linting in the pipeline
![Version: 0.110.6](https://img.shields.io/badge/Version-0.110.6-informational?style=flat-square) ![AppVersion: 0.124.0](https://img.shields.io/badge/AppVersion-0.124.0-informational?style=flat-square)

```shell
helm lint -f test-values.yaml
```
Helm Chart for the openmfp Portal

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| file://../common | common | 0.1.5 |

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| image.name | string | `"ghcr.io/openmfp/example-content"` | The image name |
| istio.virtualService.hosts[0] | string | `"your-host.com"` | |
| istio.virtualService.matchers[0].match[0].uri.exact | string | `"/ui/example-content"` | |
| istio.virtualService.matchers[0].match[1].uri.prefix | string | `"/ui/example-content/"` | |

## Debug the chart output
```shell
helm template --debug . -f test-values.yaml
```
48 changes: 0 additions & 48 deletions charts/example-content/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions charts/extension-manager-operator-crds/README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
# extension-manager-operator-crds

A Helm chart for Kubernetes

![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|

# extension-manager-operator-crds

![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)

A Helm chart for Kubernetes
Expand Down
28 changes: 0 additions & 28 deletions charts/extension-manager-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
# extension-manager-operator

A Helm chart for extension-manager-operator

![Version: 0.22.34](https://img.shields.io/badge/Version-0.22.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.66.0](https://img.shields.io/badge/AppVersion-0.66.0-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| commonAnnotations | object | `{}` | |
| crds.enabled | bool | `true` | |
| image.name | string | `"ghcr.io/openmfp/extension-content-operator"` | |
| image.tag | string | `"0.16.0"` | |

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| file://../common | common | 0.1.5 |
| file://../extension-manager-operator-crds | extension-manager-operator-crds | 0.1.3 |

# extension-manager-operator

![Version: 0.22.34](https://img.shields.io/badge/Version-0.22.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.66.0](https://img.shields.io/badge/AppVersion-0.66.0-informational?style=flat-square)

A Helm chart for extension-manager-operator
Expand Down
25 changes: 0 additions & 25 deletions charts/openmfp-crds/README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
# openmfp-crds

A chart containing CRD Definitions for OpenMFP

![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)

## Configuration

The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.

## Values

Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| account-operator-crds.enabled | bool | `true` | |
| extension-content-operator-crds.enabled | bool | `true` | |

## Requirements

| Repository | Name | Version |
|------------|------|---------|
| oci://ghcr.io/openmfp/helm-charts | account-operator-crds | 0.1.5 |

# openmfp-crds

![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)

A chart containing CRD Definitions for OpenMFP
Expand Down
8 changes: 4 additions & 4 deletions charts/openmfp/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: example-content
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.110.4
version: 0.110.5
- name: portal
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.69.125
digest: sha256:77d64e439de76b28610afb0f4a90cef812a2c337ae1736230eaca9630f823d3f
generated: "2024-11-28T13:57:21.207142921Z"
version: 0.69.126
digest: sha256:7588756eb8004b1ab314632413c9ffc0c2ca30b31a40a19341dd81af79c220dc
generated: "2024-11-28T18:10:55.890735059Z"
4 changes: 2 additions & 2 deletions charts/openmfp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ appVersion: "0.0.0"

dependencies:
- name: example-content
version: 0.110.4
version: 0.110.5
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.example-content.enabled
- name: portal
version: 0.69.125
version: 0.69.126
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.portal.enabled
Loading

0 comments on commit 2e1409a

Please sign in to comment.