From 37f2da83733200462733741d97fd9663ee5b925a Mon Sep 17 00:00:00 2001
From: Edson Dias <edson.dias@windriver.com>
Date: Tue, 25 Jun 2024 09:09:53 -0300
Subject: [PATCH] Update helm/fluxcd api version.

Right now, the metrics-server app is using beta
versions of the Fluxcd and Helm APIs, and for
this reason, some warnings are being thrown.

This change aims to update api versions, removing
beta values following this logic:
Fluxcd:
  - source.toolkit.fluxcd.io/v1beta1
  + source.toolkit.fluxcd.io/v1

Helm:
  - helm.toolkit.fluxcd.io/v2beta1
  + helm.toolkit.fluxcd.io/v2

No changes to yaml file structure are required
for this change.

Test Plan:
PASS: Build ISO & Bootstrap AIO-SX
PASS: Upload and apply metric-server app
PASS: No warnings about beta versions were
      thrown in sysinv.log

Story: 2011129
Task: 50359

Change-Id: I10b75745fe7e1dfe4c507f5f4ba701ac7b20adfe
Signed-off-by: Edson Dias <edson.dias@windriver.com>
---
 .../fluxcd-manifests/base/helmrepository.yaml                   | 2 +-
 .../fluxcd-manifests/metrics-server/helmrelease.yaml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/base/helmrepository.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/base/helmrepository.yaml
index f0b6046..742b271 100644
--- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/base/helmrepository.yaml
+++ b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/base/helmrepository.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: stx-platform
diff --git a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml
index 5ff8f65..d4de589 100644
--- a/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml
+++ b/stx-metrics-server-helm/stx-metrics-server-helm/fluxcd-manifests/metrics-server/helmrelease.yaml
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-apiVersion: "helm.toolkit.fluxcd.io/v2beta1"
+apiVersion: "helm.toolkit.fluxcd.io/v2"
 kind: HelmRelease
 metadata:
   name: metrics-server