diff --git a/evaluation/kubernetes/apps/default/echo-server/app/helmrelease.yaml b/evaluation/kubernetes/apps/default/echo-server/app/helmrelease.yaml index 7b4f1310..269d5762 100644 --- a/evaluation/kubernetes/apps/default/echo-server/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/default/echo-server/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: echo-server diff --git a/evaluation/kubernetes/apps/default/echo-server/ks.yaml b/evaluation/kubernetes/apps/default/echo-server/ks.yaml index 74899736..9f3d565d 100644 --- a/evaluation/kubernetes/apps/default/echo-server/ks.yaml +++ b/evaluation/kubernetes/apps/default/echo-server/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: echo-server namespace: default diff --git a/evaluation/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/evaluation/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml index 4aaba12a..2911f4da 100644 --- a/evaluation/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: weave-gitops diff --git a/evaluation/kubernetes/apps/flux-system/weave-gitops/ks.yaml b/evaluation/kubernetes/apps/flux-system/weave-gitops/ks.yaml index 3feaf861..a97d1123 100644 --- a/evaluation/kubernetes/apps/flux-system/weave-gitops/ks.yaml +++ b/evaluation/kubernetes/apps/flux-system/weave-gitops/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: weave-gitops namespace: flux-system diff --git a/evaluation/kubernetes/apps/istio-system/istio/istio-base/helmrelease.yaml b/evaluation/kubernetes/apps/istio-system/istio/istio-base/helmrelease.yaml index 8d79cd8b..7a2b146c 100644 --- a/evaluation/kubernetes/apps/istio-system/istio/istio-base/helmrelease.yaml +++ b/evaluation/kubernetes/apps/istio-system/istio/istio-base/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: istio-base diff --git a/evaluation/kubernetes/apps/istio-system/istio/istiod/helmrelease.yaml b/evaluation/kubernetes/apps/istio-system/istio/istiod/helmrelease.yaml index d2ef6384..118e9d45 100644 --- a/evaluation/kubernetes/apps/istio-system/istio/istiod/helmrelease.yaml +++ b/evaluation/kubernetes/apps/istio-system/istio/istiod/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: istiod @@ -42,4 +42,4 @@ spec: - name: zipkin zipkin: service: jaeger-collector.prose-system.svc.cluster.local - port: 9411 \ No newline at end of file + port: 9411 diff --git a/evaluation/kubernetes/apps/istio-system/istio/ks.yaml b/evaluation/kubernetes/apps/istio-system/istio/ks.yaml index a53ebdc2..3a2d080b 100644 --- a/evaluation/kubernetes/apps/istio-system/istio/ks.yaml +++ b/evaluation/kubernetes/apps/istio-system/istio/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: istio-base namespace: istio-system diff --git a/evaluation/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml b/evaluation/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml index a6fbbbde..7acdd2dd 100644 --- a/evaluation/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: local-path-provisioner diff --git a/evaluation/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml b/evaluation/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml index e3dae8dc..a685d473 100644 --- a/evaluation/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml +++ b/evaluation/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml @@ -13,7 +13,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: local-path-provisioner namespace: kube-system diff --git a/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml b/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml index 9d4d46ff..ccb545f8 100644 --- a/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: kubernetes-dashboard diff --git a/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml b/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml index e1c07508..4450c0d9 100644 --- a/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml +++ b/evaluation/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: kubernetes-dashboard namespace: monitoring diff --git a/evaluation/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml b/evaluation/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml index 31a9d5ea..02515a12 100644 --- a/evaluation/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/networking/ingress-nginx/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: ingress-nginx diff --git a/evaluation/kubernetes/apps/networking/ingress-nginx/ks.yaml b/evaluation/kubernetes/apps/networking/ingress-nginx/ks.yaml index 2aeaa00a..444b5d3c 100644 --- a/evaluation/kubernetes/apps/networking/ingress-nginx/ks.yaml +++ b/evaluation/kubernetes/apps/networking/ingress-nginx/ks.yaml @@ -13,7 +13,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: ingress-nginx namespace: networking diff --git a/evaluation/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml b/evaluation/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml index e6d374a4..4b3c3604 100644 --- a/evaluation/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: k8s-gateway diff --git a/evaluation/kubernetes/apps/networking/k8s-gateway/ks.yaml b/evaluation/kubernetes/apps/networking/k8s-gateway/ks.yaml index a57dee13..591e4860 100644 --- a/evaluation/kubernetes/apps/networking/k8s-gateway/ks.yaml +++ b/evaluation/kubernetes/apps/networking/k8s-gateway/ks.yaml @@ -14,7 +14,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: k8s-gateway namespace: networking diff --git a/evaluation/kubernetes/apps/networking/metallb/app/helmrelease.yaml b/evaluation/kubernetes/apps/networking/metallb/app/helmrelease.yaml index c4ddb24a..b3791e3b 100644 --- a/evaluation/kubernetes/apps/networking/metallb/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/networking/metallb/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: metallb diff --git a/evaluation/kubernetes/apps/networking/metallb/ks.yaml b/evaluation/kubernetes/apps/networking/metallb/ks.yaml index a5816950..b1971074 100644 --- a/evaluation/kubernetes/apps/networking/metallb/ks.yaml +++ b/evaluation/kubernetes/apps/networking/metallb/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: metallb namespace: networking diff --git a/evaluation/kubernetes/apps/prose-system/jaeger/unused-jaeger-chart/helmrelease.yaml b/evaluation/kubernetes/apps/prose-system/jaeger/unused-jaeger-chart/helmrelease.yaml index 4155125b..ce4c71b3 100644 --- a/evaluation/kubernetes/apps/prose-system/jaeger/unused-jaeger-chart/helmrelease.yaml +++ b/evaluation/kubernetes/apps/prose-system/jaeger/unused-jaeger-chart/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: jaeger diff --git a/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/crds/helmrelease.yaml b/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/crds/helmrelease.yaml index 5a67a640..a126e572 100644 --- a/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/crds/helmrelease.yaml +++ b/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/crds/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: opentelemetry-operator diff --git a/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/ks.yaml b/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/ks.yaml index 4568da5c..7c9db870 100644 --- a/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/ks.yaml +++ b/evaluation/kubernetes/apps/prose-system/opentelemetry-operator/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: opentelemetry-operator namespace: prose-system diff --git a/evaluation/kubernetes/apps/prose-system/prose/app/helmrelease.yaml b/evaluation/kubernetes/apps/prose-system/prose/app/helmrelease.yaml index 3bfdf443..f0aa08de 100644 --- a/evaluation/kubernetes/apps/prose-system/prose/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/prose-system/prose/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: prose diff --git a/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/app/helmrelease.yaml b/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/app/helmrelease.yaml index e6d8467a..cc2f6505 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: jellyfin diff --git a/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/ks.yaml b/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/ks.yaml index 64b4eae5..8fe35082 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/ks.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/jellyfin/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: jellyfin namespace: jellyfin diff --git a/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/app/helmrelease.yaml b/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/app/helmrelease.yaml index e10d4ec9..5ae8e89b 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: jellyseerr diff --git a/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/ks.yaml b/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/ks.yaml index a80e6b1c..5bb41cb2 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/ks.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/jellyseerr/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: jellyseerr namespace: jellyseerr diff --git a/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/app/helmrelease.yaml b/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/app/helmrelease.yaml index 0d8f1f6d..c96dedac 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: online-boutique diff --git a/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/ks.yaml b/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/ks.yaml index fca58ca8..3d6d99ba 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/ks.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/online-boutique/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: online-boutique namespace: online-boutique diff --git a/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/app/helmrelease.yaml b/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/app/helmrelease.yaml index 977b585e..dda7ed77 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: opentelemetry-demo diff --git a/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/ks.yaml b/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/ks.yaml index 64e57907..4c3de060 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/ks.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/opentelemetry/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: opentelemetry-demo namespace: opentelemetry diff --git a/evaluation/kubernetes/apps/test-sample-microservices/sockshop/app/helmrelease.yaml b/evaluation/kubernetes/apps/test-sample-microservices/sockshop/app/helmrelease.yaml index e374356b..f17678bc 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/sockshop/app/helmrelease.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/sockshop/app/helmrelease.yaml @@ -1,5 +1,5 @@ --- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: name: sockshop diff --git a/evaluation/kubernetes/apps/test-sample-microservices/sockshop/ks.yaml b/evaluation/kubernetes/apps/test-sample-microservices/sockshop/ks.yaml index 2efda2b4..25ce2e17 100644 --- a/evaluation/kubernetes/apps/test-sample-microservices/sockshop/ks.yaml +++ b/evaluation/kubernetes/apps/test-sample-microservices/sockshop/ks.yaml @@ -11,7 +11,7 @@ spec: kind: GitRepository name: prose-k8s-home-ops healthChecks: - - apiVersion: helm.toolkit.fluxcd.io/v2beta1 + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease name: sockshop namespace: sockshop diff --git a/evaluation/kubernetes/bootstrap/kustomization.yaml b/evaluation/kubernetes/bootstrap/kustomization.yaml index 8701e7f8..673e59fa 100644 --- a/evaluation/kubernetes/bootstrap/kustomization.yaml +++ b/evaluation/kubernetes/bootstrap/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - github.com/fluxcd/flux2/manifests/install?ref=v2.0.0-rc.1 \ No newline at end of file + - github.com/fluxcd/flux2/manifests/install?ref=v2.2.3 \ No newline at end of file diff --git a/evaluation/kubernetes/flux/config/flux.yaml b/evaluation/kubernetes/flux/config/flux.yaml index 0f565999..395ae8d0 100644 --- a/evaluation/kubernetes/flux/config/flux.yaml +++ b/evaluation/kubernetes/flux/config/flux.yaml @@ -8,7 +8,7 @@ spec: interval: 10m url: oci://ghcr.io/fluxcd/flux-manifests ref: - tag: v2.0.0-rc.1@sha256:c3c253bcbb928c64c519d26e39bbc57074eae7f6309bb901269bf1b3edc6574c + tag: v2.2.3@sha256:187f6a409354d1a6156bb9ede0c81da13e1daccef421203575d23679ccc9b320 --- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization