Skip to content

Commit 329d55f

Browse files
committed
Resolve deprecated API references
HelmRelease is v2 and HelmRepository is v1 now, as of Flux 2.3 Signed-off-by: Kingdon Barrett <[email protected]>
1 parent c955975 commit 329d55f

12 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎packages/apps/kubernetes/templates/helmreleases/cilium.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
1+
apiVersion: helm.toolkit.fluxcd.io/v2
22
kind: HelmRelease
33
metadata:
44
name: {{ .Release.Name }}-cilium

‎packages/apps/kubernetes/templates/helmreleases/csi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
1+
apiVersion: helm.toolkit.fluxcd.io/v2
22
kind: HelmRelease
33
metadata:
44
name: {{ .Release.Name }}-csi

‎packages/apps/tenant/templates/etcd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.etcd }}
2-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
2+
apiVersion: helm.toolkit.fluxcd.io/v2
33
kind: HelmRelease
44
metadata:
55
name: etcd

‎packages/apps/tenant/templates/ingress.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.ingress }}
2-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
2+
apiVersion: helm.toolkit.fluxcd.io/v2
33
kind: HelmRelease
44
metadata:
55
name: ingress

‎packages/apps/tenant/templates/monitoring.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.monitoring }}
2-
apiVersion: helm.toolkit.fluxcd.io/v2beta1
2+
apiVersion: helm.toolkit.fluxcd.io/v2
33
kind: HelmRelease
44
metadata:
55
name: monitoring

‎packages/core/platform/bundles/paas-full.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ releases:
153153
chart: cozy-dashboard
154154
namespace: cozy-dashboard
155155
dependsOn: [cilium,kubeovn]
156-
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1beta2" }}
157-
{{- with (lookup "source.toolkit.fluxcd.io/v1beta2" "HelmRepository" "cozy-public" "").items }}
156+
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
157+
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
158158
values:
159159
kubeapps:
160160
redis:

‎packages/core/platform/bundles/paas-hosted.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ releases:
9191
chart: cozy-dashboard
9292
namespace: cozy-dashboard
9393
dependsOn: []
94-
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1beta2" }}
95-
{{- with (lookup "source.toolkit.fluxcd.io/v1beta2" "HelmRepository" "cozy-public" "").items }}
94+
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
95+
{{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }}
9696
values:
9797
kubeapps:
9898
redis:

‎packages/core/platform/templates/apps.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
{{- $bundle := tpl (.Files.Get (printf "bundles/%s.yaml" $bundleName)) . | fromYaml }}
44
{{- $host := "example.org" }}
55
{{- $tenantRoot := list }}
6-
{{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2beta2" }}
7-
{{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2beta2" "HelmRelease" "tenant-root" "tenant-root" }}
6+
{{- if .Capabilities.APIVersions.Has "helm.toolkit.fluxcd.io/v2" }}
7+
{{- $tenantRoot = lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" "tenant-root" "tenant-root" }}
88
{{- end }}
99
{{- if and $tenantRoot $tenantRoot.spec $tenantRoot.spec.values $tenantRoot.spec.values.host }}
1010
{{- $host = $tenantRoot.spec.values.host }}
@@ -22,7 +22,7 @@ metadata:
2222
namespace.cozystack.io/host: "{{ $host }}"
2323
name: tenant-root
2424
---
25-
apiVersion: helm.toolkit.fluxcd.io/v2beta2
25+
apiVersion: helm.toolkit.fluxcd.io/v2
2626
kind: HelmRelease
2727
metadata:
2828
name: tenant-root

‎packages/core/platform/templates/helmreleases.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{- range $x := $bundle.releases }}
1313
{{- if not (has $x.name $disabledComponents) }}
1414
---
15-
apiVersion: helm.toolkit.fluxcd.io/v2beta2
15+
apiVersion: helm.toolkit.fluxcd.io/v2
1616
kind: HelmRelease
1717
metadata:
1818
name: {{ $x.name }}

‎packages/core/platform/templates/helmrepos.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: source.toolkit.fluxcd.io/v1beta2
2+
apiVersion: source.toolkit.fluxcd.io/v1
33
kind: HelmRepository
44
metadata:
55
name: cozystack-system
@@ -10,7 +10,7 @@ spec:
1010
interval: 5m0s
1111
url: http://cozystack.cozy-system.svc/repos/system
1212
---
13-
apiVersion: source.toolkit.fluxcd.io/v1beta2
13+
apiVersion: source.toolkit.fluxcd.io/v1
1414
kind: HelmRepository
1515
metadata:
1616
name: cozystack-apps
@@ -22,7 +22,7 @@ spec:
2222
interval: 5m0s
2323
url: http://cozystack.cozy-system.svc/repos/apps
2424
---
25-
apiVersion: source.toolkit.fluxcd.io/v1beta2
25+
apiVersion: source.toolkit.fluxcd.io/v1
2626
kind: HelmRepository
2727
metadata:
2828
name: cozystack-extra

0 commit comments

Comments
 (0)