Upgrade flux and use latest api versions (#81)

* init Signed-off-by: Dipankar Das <[email protected]> * update: fluxcd version and helmRelases as well Signed-off-by: Dipankar Das <[email protected]> * update: docs for the dev cluster setup Signed-off-by: Dipankar Das <[email protected]> Co-authored-by: Ross Fairbanks <[email protected]> --------- Signed-off-by: Dipankar Das <[email protected]> Co-authored-by: Ross Fairbanks <[email protected]>
cncf-tags · Mar 30, 2024 · e295f70 · e295f70
1 parent 09ef105
commit e295f70
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 infrastructure/equinix-metal/.terraform/
 infrastructure/equinix-metal/terraform.tfvars
+infrastructure/equinix-metal/.terraform.lock.hcl
diff --git a/clusters/base/kepler.yaml b/clusters/base/kepler.yaml
@@ -1,5 +1,5 @@
 # Refer: https://artifacthub.io/packages/helm/kepler/kepler?modal=install
-# Note: By default kube-prometheus does not let you scrape services deployed in namespaces other than monitoring. 
+# Note: By default kube-prometheus does not let you scrape services deployed in namespaces other than monitoring.
 # So if you are running Kepler outside monitoring update the kube-prometheus
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
@@ -12,7 +12,7 @@ spec:
   url: https://sustainable-computing-io.github.io/kepler-helm-chart
 ---
 # https://fluxcd.io/flux/components/helm/helmreleases/#install-configuration
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kepler

diff --git a/clusters/base/kube-prometheus-stack.yaml b/clusters/base/kube-prometheus-stack.yaml
@@ -8,7 +8,7 @@ spec:
   interval: 24h
   url: https://prometheus-community.github.io/helm-charts
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kube-prometheus-stack

diff --git a/docs/infrastructure/cluster-infra-development.md b/docs/infrastructure/cluster-infra-development.md
@@ -11,7 +11,7 @@ Our cluster runs on physical servers from Equinix Metal contributed to CNCF.
 
 - Install the [tofu](https://opentofu.org/docs/intro/install/) CLI
 - Fork the tooling repo https://github.com/cncf-tags/green-reviews-tooling
-- Get access to the `Green Reviews Cluster Dev` vault in the TAG ENV 1Password account (please post in the #tag-env-wg-green-reviews channel in CNCF Slack so we have tracking for your request) 
+- Get access to the `Green Reviews Cluster Dev` vault in the TAG ENV 1Password account (please post in the #tag-env-wg-green-reviews channel in CNCF Slack so we have tracking for your request)
 
 ## Setup
 
@@ -42,6 +42,12 @@ export TF_VAR_flux_github_branch="*** Your branch ***"
 export TF_VAR_ssh_public_key="*** Your SSH public key ***"
 ```
 
+- Initialize tofu
+
+```sh
+tofu init
+```
+
 - Check tofu workspaces
 
 ```sh
@@ -53,6 +59,9 @@ tofu workspace list
 
 - If the dev workspace doesn't exist create it.
 
+> [!CAUTION]
+> check if its already created or not
+
 ```sh
 tofu workspace new dev
 ```
@@ -69,11 +78,6 @@ Follow the usual tofu workflow. See [core workflow](https://opentofu.org/docs/in
 for more details.
 
 - Make changes
-- Initialize tofu
-
-```sh
-tofu init
-```
 
 - Review changes
 

diff --git a/infrastructure/equinix-metal/variables.tf b/infrastructure/equinix-metal/variables.tf
@@ -79,7 +79,7 @@ variable "flux_github_user" {
 variable "flux_version" {
   description = "Flux CLI version"
   type        = string
-  default     = "2.1.2"
+  default     = "2.2.3"
 }
 
 variable "k3s_token" {