Skip to content

Commit adb2d8b

Browse files
mbaldessarimbaldessari
authored
Merge pull request #5 from mbaldessari/eso-operator
Switch to the ESO operator
2 parents cc62382 + cea861c commit adb2d8b

9 files changed

+127
-136
lines changed

‎Chart.yaml

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ description: A Helm chart to configure the golang-based external-secrets.
33
keywords:
44
- pattern
55
name: golang-external-secrets
6-
version: 0.1.2
7-
dependencies:
8-
- name: external-secrets
9-
version: "0.10.0"
10-
repository: "https://charts.external-secrets.io"
11-
#"https://external-secrets.github.io/kubernetes-external-secrets"
12-
6+
version: 0.2.0
137
home: https://github.com/validatedpatterns/golang-external-secrets-chart
148
maintainers:
159
- name: Validated Patterns Team

‎README.md

+30-26
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,32 @@
44

55
A Helm chart to configure the golang-based external-secrets.
66

7-
This chart is used by the Validated Patterns to set up the external secrets
7+
This chart is used by the Validated Patterns to set up the external secrets. This chart
8+
sets up the needed pieces for ESO to work with the Validated Patterns Framework.
9+
10+
**Note** this version uses the ESO operator. Since we prefer using UBI images, we need
11+
to manually update the ESO UBI images in the `values.yaml` file when updating.
12+
This requires that the operator is installed via the VP subscriptions mechanism.
13+
14+
Here is a full example:
15+
```yaml
16+
clusterGroup:
17+
namespaces:
18+
- golang-external-secrets
19+
subscriptions:
20+
golang-external-secrets:
21+
channel: alpha
22+
name: external-secrets-operator
23+
namespace: golang-external-secrets
24+
source: community-operators
25+
applications:
26+
golang-external-secrets:
27+
name: golang-external-secrets
28+
namespace: golang-external-secrets
29+
project: hub
30+
chart: golang-external-secrets
31+
chartVersion: 0.2.*
32+
```
833
934
**Homepage:** <https://github.com/validatedpatterns/golang-external-secrets-chart>
1035
@@ -14,21 +39,12 @@ This chart is used by the Validated Patterns to set up the external secrets
1439
| ---- | ------ | --- |
1540
| Validated Patterns Team | <[email protected]> | |
1641
17-
## Requirements
18-
19-
| Repository | Name | Version |
20-
|------------|------|---------|
21-
| https://charts.external-secrets.io | external-secrets | 0.10.0 |
22-
2342
## Values
2443
2544
| Key | Type | Default | Description |
2645
|-----|------|---------|-------------|
46+
| certController.image.tag | string | `"v0.10.4-ubi"` | Tag for the ESO certController image |
2747
| clusterGroup.isHubCluster | bool | `true` | The variable that defines when a cluster is the HUB |
28-
| external-secrets | object | depends on the individual settings | A few settings containing which images are being used |
29-
| external-secrets.certController.image.tag | string | `"v0.10.0-ubi"` | Tag for the ESO certController image |
30-
| external-secrets.image.tag | string | `"v0.10.0-ubi"` | Tag for the ESO main image |
31-
| external-secrets.webhook.image.tag | string | `"v0.10.0-ubi"` | Tag for the ESO webhook image |
3248
| global | object | depends on the individual settings | The global namespace containes some globally used variables used in patterns |
3349
| global.clusterDomain | string | `"foo.example.com"` | The DNS entry for the cluster the chart is being rendered on |
3450
| global.hubClusterDomain | string | `"hub.example.com"` | The DNS entry for the hub cluster |
@@ -52,21 +68,9 @@ This chart is used by the Validated Patterns to set up the external secrets
5268
| golangExternalSecrets.rbac.rolename | string | `"hub-role"` | The name of the vault role when connecting to the vault from the hub |
5369
| golangExternalSecrets.vault | object | depends on the individual settings | Some vault configuration entries |
5470
| golangExternalSecrets.vault.mountPath | string | `"hub"` | The vault secrets' path when connecting to it from the hub |
71+
| image | object | depends on the individual settings | A few settings containing which images are being used |
72+
| image.tag | string | `"v0.10.4-ubi"` | Tag for the ESO main image |
73+
| webhook.image.tag | string | `"v0.10.4-ubi"` | Tag for the ESO webhook image |
5574

5675
----------------------------------------------
5776
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
58-
59-
## Subchart Update
60-
61-
When updating this sub-chart, please remember to tweak the image tag in values.yaml.
62-
That is because we want to use -ubi images if possible and there is no suffix option, so
63-
we just override the tag with the version + "-ubi"
64-
65-
### Steps
66-
67-
1. Edit the version in Chart.yaml
68-
2. Run `helm dependency update .`
69-
3. Run `./update-helm-dependency.sh`
70-
4. Tweak `values.yaml` with the new image versions
71-
5. Run `make test`
72-
6. Commit to Git

‎README.md.gotmpl

+26-17
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,32 @@
55

66
{{ template "chart.description" . }}
77

8-
This chart is used by the Validated Patterns to set up the external secrets
8+
This chart is used by the Validated Patterns to set up the external secrets. This chart
9+
sets up the needed pieces for ESO to work with the Validated Patterns Framework.
10+
11+
**Note** this version uses the ESO operator. Since we prefer using UBI images, we need
12+
to manually update the ESO UBI images in the `values.yaml` file when updating.
13+
This requires that the operator is installed via the VP subscriptions mechanism.
14+
15+
Here is a full example:
16+
```yaml
17+
clusterGroup:
18+
namespaces:
19+
- golang-external-secrets
20+
subscriptions:
21+
golang-external-secrets:
22+
channel: alpha
23+
name: external-secrets-operator
24+
namespace: golang-external-secrets
25+
source: community-operators
26+
applications:
27+
golang-external-secrets:
28+
name: golang-external-secrets
29+
namespace: golang-external-secrets
30+
project: hub
31+
chart: golang-external-secrets
32+
chartVersion: 0.2.*
33+
```
934

1035
{{ template "chart.homepageLine" . }}
1136

@@ -18,19 +43,3 @@ This chart is used by the Validated Patterns to set up the external secrets
1843
{{ template "chart.valuesSection" . }}
1944

2045
{{ template "helm-docs.versionFooter" . }}
21-
22-
23-
## Subchart Update
24-
25-
When updating this sub-chart, please remember to tweak the image tag in values.yaml.
26-
That is because we want to use -ubi images if possible and there is no suffix option, so
27-
we just override the tag with the version + "-ubi"
28-
29-
### Steps
30-
31-
1. Edit the version in Chart.yaml
32-
2. Run `helm dependency update .`
33-
3. Run `./update-helm-dependency.sh`
34-
4. Tweak `values.yaml` with the new image versions
35-
5. Run `make test`
36-
6. Commit to Git

‎charts/external-secrets-0.10.0.tgz

-80.3 KB
Binary file not shown.

‎local-patches/0001-runasuser-comment-out.patch

-48
This file was deleted.

‎templates/golang-external-secrets-operator-config.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# See https://github.com/external-secrets/external-secrets-helm-operator/blob/main/config/samples/operator_v1alpha1_operatorconfig.yaml
2+
# for a full definition
3+
apiVersion: operator.external-secrets.io/v1alpha1
4+
kind: OperatorConfig
5+
metadata:
6+
name: golang-external-secrets
7+
annotations:
8+
# We need the OperatorConfig to be the first thing that gets deployed
9+
# This is because we need to deploy the secret *after* the operatorconfig
10+
# has created the golang-external-secret service account
11+
argocd.argoproj.io/sync-wave: "-10"
12+
spec:
13+
image:
14+
tag: {{ .Values.image.tag }}
15+
webhook:
16+
image:
17+
tag: {{ .Values.webhook.image.tag }}
18+
certController:
19+
image:
20+
tag: {{ .Values.certController.image.tag }}
21+
prometheus:
22+
enabled: true
23+
service:
24+
port: 8080
25+
resources:
26+
requests:
27+
cpu: 10m
28+
memory: 96Mi
29+
limits:
30+
cpu: 100m
31+
memory: 256Mi

‎tests/golang_external_secrets_operator_config.yaml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
suite: Test golang-external-secrets operatorconfig with default values
2+
templates:
3+
- templates/golang-external-secrets-operator-config.yaml
4+
release:
5+
name: release-test
6+
tests:
7+
- it: should output default values for the OperatorConfig
8+
asserts:
9+
- containsDocument:
10+
kind: OperatorConfig
11+
apiVersion: v1
12+
name: golang-external-secrets
13+
- equal:
14+
path: metadata.annotations["argocd.argoproj.io/sync-wave"]
15+
value: "-10"
16+
17+
- it: should set the images to the default values for the OperatorConfig
18+
asserts:
19+
- containsDocument:
20+
kind: OperatorConfig
21+
apiVersion: v1
22+
name: golang-external-secrets
23+
- equal:
24+
path: spec.image.tag
25+
value: v0.10.4-ubi
26+
- equal:
27+
path: spec.webhook.image.tag
28+
value: v0.10.4-ubi
29+
- equal:
30+
path: spec.certController.image.tag
31+
value: v0.10.4-ubi

‎update-helm-dependency.sh

-29
This file was deleted.

‎values.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,14 @@ clusterGroup:
6868

6969
# -- A few settings containing which images are being used
7070
# @default -- depends on the individual settings
71-
external-secrets:
71+
image:
72+
# -- Tag for the ESO main image
73+
tag: v0.10.4-ubi
74+
webhook:
7275
image:
73-
# -- Tag for the ESO main image
74-
tag: v0.10.0-ubi
75-
webhook:
76-
image:
7776
# -- Tag for the ESO webhook image
78-
tag: v0.10.0-ubi
79-
certController:
80-
image:
77+
tag: v0.10.4-ubi
78+
certController:
79+
image:
8180
# -- Tag for the ESO certController image
82-
tag: v0.10.0-ubi
81+
tag: v0.10.4-ubi

0 commit comments

Comments
 (0)