Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit 40888d7

Browse files
codablockcodablock
authored
Merge pull request #26 from kluctl/upgrade-flux-kluctl-controller
feat: Upgrade flux-kluctl-controller and cherry-pick #25
2 parents 8281506 + 0cafda3 commit 40888d7

File tree

11 files changed

+51
-10
lines changed

11 files changed

+51
-10
lines changed

‎charts/flux-kluctl-controller/CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
11
# Changelog
22

3-
## [flux-kluctl-controller-Unreleased](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.7...HEAD) (2023-03-06)
3+
## [flux-kluctl-controller-Unreleased](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.8...HEAD) (2023-05-12)
4+
5+
### Features
6+
7+
* **flux-kluctl-controller:** Allow users to specify additional env variables
8+
([0b72204](https://github.com/kluctl/charts/commit/0b7220424e62404600bd776a260aef3b37930a53))
49

510
### Fixes
611

12+
* **flux-kluctl-controller:** Upgrade flux-kluctl-controller to v0.15.1
13+
([20b414d](https://github.com/kluctl/charts/commit/20b414d8040e7de53bfa96734b0b7ba2ebca08d4))
14+
15+
### [flux-kluctl-controller-0.2.8](https://github.com/kluctl/charts/compare/flux-kluctl-controller-0.2.7...flux-kluctl-controller-0.2.8) (2023-03-06)
16+
17+
#### Fixes
18+
719
* **flux-kluctl-controller:** Upgrade flux-kluctl-controller to 0.15.0
820
([da5719e](https://github.com/kluctl/charts/commit/da5719e78f563c39f2425bbe6206482abb8957d9))
921

‎charts/flux-kluctl-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ maintainers:
99
name: codablock
1010
description: A Helm chart for the flux-kluctl-controller
1111
type: application
12-
version: 0.2.8
13-
appVersion: "v0.15.0"
12+
version: 0.2.9
13+
appVersion: "v0.15.1"

‎charts/flux-kluctl-controller/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# flux-kluctl-controller
22

3-
![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.0](https://img.shields.io/badge/AppVersion-v0.15.0-informational?style=flat-square)
3+
![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.1](https://img.shields.io/badge/AppVersion-v0.15.1-informational?style=flat-square)
44

55
A Helm chart for the flux-kluctl-controller
66

@@ -17,6 +17,7 @@ A Helm chart for the flux-kluctl-controller
1717
| Key | Type | Default | Description |
1818
|-----|------|---------|-------------|
1919
| affinity | object | `{}` | |
20+
| env | list | `[]` | |
2021
| fullnameOverride | string | `""` | |
2122
| image.pullPolicy | string | `"IfNotPresent"` | |
2223
| image.repository | string | `"ghcr.io/kluctl/flux-kluctl-controller"` | |

‎charts/flux-kluctl-controller/crds/flux.kluctl.io_kluctldeployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ spec:
170170
description: 'SecretRef holds the name of a secret that contains
171171
the Helm credentials. The secret must either contain the fields
172172
`credentialsId` which refers to the credentialsId found in
173-
https://kluctl.io/docs/reference/deployments/helm/#private-chart-repositories
173+
https://kluctl.io/docs/kluctl/reference/deployments/helm/#private-chart-repositories
174174
or an `url` used to match the credentials found in Kluctl
175175
projects helm-chart.yaml files. The secret can either container
176176
basic authentication credentials via `username` and `password`

‎charts/flux-kluctl-controller/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ spec:
4343
valueFrom:
4444
fieldRef:
4545
fieldPath: metadata.namespace
46+
{{- with .Values.env }}
47+
{{- toYaml . | nindent 12 }}
48+
{{- end }}
4649
args:
4750
- --watch-all-namespaces
4851
- --log-level=info

‎charts/flux-kluctl-controller/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ securityContext:
3838
seccompProfile:
3939
type: RuntimeDefault
4040

41+
# Additional environment variables
42+
env: []
43+
# - name: HTTPS_PROXY
44+
# value: https://proxy.example.org
45+
# - name: NO_PROXY
46+
# value: 10.96.0.1
47+
4148
service:
4249
type: ClusterIP
4350
prometheus:

‎charts/template-controller/CHANGELOG.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
# Changelog
22

3-
## [template-controller-Unreleased](https://github.com/kluctl/charts/compare/template-controller-0.1.2...HEAD) (2023-01-16)
3+
## [template-controller-Unreleased](https://github.com/kluctl/charts/compare/template-controller-0.2.0...HEAD) (2023-05-12)
44

55
### Features
66

7-
* **template-controller:** Upgrade controller to 0.6.0
8-
([d5f1859](https://github.com/kluctl/charts/commit/d5f1859fe115033d0a5876ef23fe0ad975fd182b))
7+
* **template-controller:** Allow users to specify additional env variables
8+
([b5960f1](https://github.com/kluctl/charts/commit/b5960f1ff1e14f8b8b9ac65217cd5a8da5c62f49))
9+
10+
## [template-controller-0.2.0](https://github.com/kluctl/charts/compare/template-controller-0.1.2...template-controller-0.2.0) (2023-01-16)
11+
12+
### Features
13+
14+
* **template-controller:** Upgrade controller to 0.6.0 (#21)
15+
([325f21e](https://github.com/kluctl/charts/commit/325f21e0088ab0efa7840f9fbb22d4d267be07d5))
916

1017
### [template-controller-0.1.2](https://github.com/kluctl/charts/compare/template-controller-0.1.1...template-controller-0.1.2) (2022-12-20)
1118

‎charts/template-controller/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ maintainers:
99
name: codablock
1010
description: A Helm chart for the template-controller
1111
type: application
12-
version: 0.2.0
12+
version: 0.2.1
1313
appVersion: "v0.6.0"

‎charts/template-controller/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# template-controller
22

3-
![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: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square)
3+
![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.6.0](https://img.shields.io/badge/AppVersion-v0.6.0-informational?style=flat-square)
44

55
A Helm chart for the template-controller
66

@@ -17,6 +17,7 @@ A Helm chart for the template-controller
1717
| Key | Type | Default | Description |
1818
|-----|------|---------|-------------|
1919
| affinity | object | `{}` | |
20+
| env | list | `[]` | |
2021
| fullnameOverride | string | `""` | |
2122
| image.pullPolicy | string | `"IfNotPresent"` | |
2223
| image.repository | string | `"ghcr.io/kluctl/template-controller"` | |

‎charts/template-controller/templates/deployment.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ spec:
3535
valueFrom:
3636
fieldRef:
3737
fieldPath: metadata.namespace
38+
{{- with .Values.env }}
39+
{{- toYaml . | nindent 12 }}
40+
{{- end }}
3841
args:
3942
- --watch-all-namespaces
4043
- --leader-elect

0 commit comments

Comments
 (0)