fix(deps): updated reloader helm chart to 2.0.0 (#56)

Author: daniel-butler-irl

README.md

@@ -526,12 +526,12 @@ module "es_kubernetes_secret" {
 | <a name="input_eso_pod_configuration"></a> [eso\_pod\_configuration](#input\_eso\_pod\_configuration) | Configuration to use to customise ESO deployment on specific pods. Setting appropriate values will result in customising ESO helm release. Default value is {} to keep ESO standard deployment. Ignore the key if not required. | <pre>object({<br/>    annotations = optional(object({<br/>      # The annotations for external secret controller pods.<br/>      external_secrets = optional(map(string), {})<br/>      # The annotations for external secret cert controller pods.<br/>      external_secrets_cert_controller = optional(map(string), {})<br/>      # The annotations for external secret controller pods.<br/>      external_secrets_webhook = optional(map(string), {})<br/>    }), {})<br/><br/>    labels = optional(object({<br/>      # The labels for external secret controller pods.<br/>      external_secrets = optional(map(string), {})<br/>      # The labels for external secret cert controller pods.<br/>      external_secrets_cert_controller = optional(map(string), {})<br/>      # The labels for external secret controller pods.<br/>      external_secrets_webhook = optional(map(string), {})<br/>    }), {})<br/>  })</pre> | `{}` | no |
 | <a name="input_existing_eso_namespace"></a> [existing\_eso\_namespace](#input\_existing\_eso\_namespace) | Existing Namespace to be used to install ESO components including helm releases. If eso\_store\_scope == cluster, this will also be used to deploy ClusterSecretStore/cluster\_store in it | `string` | `null` | no |
 | <a name="input_reloader_chart_location"></a> [reloader\_chart\_location](#input\_reloader\_chart\_location) | The location of the Reloader Helm chart. | `string` | `"https://stakater.github.io/stakater-charts"` | no |
-| <a name="input_reloader_chart_version"></a> [reloader\_chart\_version](#input\_reloader\_chart\_version) | The version of the Reloader Helm chart. Ensure that the chart version is compatible with the image version specified in reloader\_image\_version. | `string` | `"1.3.0"` | no |
+| <a name="input_reloader_chart_version"></a> [reloader\_chart\_version](#input\_reloader\_chart\_version) | The version of the Reloader Helm chart. Ensure that the chart version is compatible with the image version specified in reloader\_image\_version. | `string` | `"2.0.0"` | no |
 | <a name="input_reloader_custom_values"></a> [reloader\_custom\_values](#input\_reloader\_custom\_values) | String containing custom values to be used for reloader helm chart. See https://github.com/stakater/Reloader/blob/master/deployments/kubernetes/chart/reloader/values.yaml | `string` | `null` | no |
 | <a name="input_reloader_deployed"></a> [reloader\_deployed](#input\_reloader\_deployed) | Whether to deploy reloader or not https://github.com/stakater/Reloader | `bool` | `true` | no |
 | <a name="input_reloader_ignore_configmaps"></a> [reloader\_ignore\_configmaps](#input\_reloader\_ignore\_configmaps) | Whether to ignore configmap changes or not | `bool` | `false` | no |
 | <a name="input_reloader_ignore_secrets"></a> [reloader\_ignore\_secrets](#input\_reloader\_ignore\_secrets) | Whether to ignore secret changes or not | `bool` | `false` | no |
-| <a name="input_reloader_image"></a> [reloader\_image](#input\_reloader\_image) | The reloader image in the format of `[registry-url]/[namespace]/[image]`. | `string` | `"ghcr.io/stakater/reloader"` | no |
+| <a name="input_reloader_image"></a> [reloader\_image](#input\_reloader\_image) | The reloader image repository in the format of `[registry-url]/[namespace]/[image]`. | `string` | `"ghcr.io/stakater/reloader"` | no |
 | <a name="input_reloader_image_version"></a> [reloader\_image\_version](#input\_reloader\_image\_version) | The version or digest for the reloader image to deploy. If changing the value, ensure it is compatible with the chart version set in reloader\_chart\_version. | `string` | `"v1.3.0-ubi@sha256:21bb83e9cf5641620b6a48de1a7e1a0676f438f3b32004c19ea03b55a98bc756"` | no |
 | <a name="input_reloader_is_argo_rollouts"></a> [reloader\_is\_argo\_rollouts](#input\_reloader\_is\_argo\_rollouts) | Enable Argo Rollouts | `bool` | `false` | no |
 | <a name="input_reloader_is_openshift"></a> [reloader\_is\_openshift](#input\_reloader\_is\_openshift) | Enable OpenShift DeploymentConfigs | `bool` | `true` | no |

main.tf

@@ -228,15 +228,14 @@ resource "helm_release" "pod_reloader" {
   version    = var.reloader_chart_version
   wait       = true
 
-  # Set the deployment image name and tag
   set {
-    name  = "reloader.deployment.image.name"
+    name  = "image.repository"
     type  = "string"
     value = var.reloader_image
   }
 
   set {
-    name  = "reloader.deployment.image.tag"
+    name  = "image.tag"
     type  = "string"
     value = var.reloader_image_version
   }

tests/pr_test.go

@@ -4,6 +4,9 @@ package test
 import (
 	"log"
 	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
 	"testing"
 	"time"
 
@@ -188,9 +191,10 @@ func TestRunDefaultExample(t *testing.T) {
 	defer func() {
 		options.TestTearDown()
 	}()
-	output, err := options.RunTestConsistency()
+	_, err := options.RunTestConsistency()
 
 	if assert.Nil(t, err, "Consistency test should not have errored") {
+
 		outputs := options.LastTestTerraformOutputs
 		_, tfOutputsErr := testhelper.ValidateTerraformOutputs(outputs, "cluster_id")
 		if assert.Nil(t, tfOutputsErr, tfOutputsErr) {
@@ -243,10 +247,9 @@ func TestRunDefaultExample(t *testing.T) {
 					}
 				}
 			}
+
 		}
 	}
-
-	assert.NotNil(t, output, "Expected some output")
 }
 
 func TestRunUpgradeExample(t *testing.T) {
@@ -290,6 +293,82 @@ func TestReloaderOperational(t *testing.T) {
 					_ = os.Remove(clusterConfigPath)
 				}()
 				if assert.Nil(t, err, "Error getting cluster config path") {
+					// check Reloader is installed with the correct image and version
+					// assert reloader image
+					// get the image and version from the variables.tf in options.TerraformDir
+					// read the file
+					variablesFile := options.TerraformDir + "/variables.tf"
+					data, err := os.ReadFile(variablesFile)
+					if assert.Nil(t, err, "Error reading variables file") {
+						// parse the file
+						lines := strings.Split(string(data), "\n")
+						// find the line with the reloader image
+						var reloaderImage string
+						var reloaderVersion string
+
+						// Get values from TerraformVars if provided
+						if options.TerraformVars["reloader_image"] != nil {
+							reloaderImage = options.TerraformVars["reloader_image"].(string)
+						} else {
+							// Check for both  reloader_image variables
+							reloaderImage = extractDefaultValueFromFile(lines, "reloader_image")
+
+							// If still not found, check the root variables.tf file
+							if reloaderImage == "" {
+								rootVariablesPath := filepath.Join(options.TerraformDir, "..", "..", "variables.tf")
+								if rootData, err := os.ReadFile(rootVariablesPath); err == nil {
+									rootLines := strings.Split(string(rootData), "\n")
+									reloaderImage = extractDefaultValueFromFile(rootLines, "reloader_image")
+								}
+							}
+						}
+
+						if options.TerraformVars["reloader_image_version"] != nil {
+							reloaderVersion = options.TerraformVars["reloader_image_version"].(string)
+						} else {
+							// Find the line with the reloader version
+							reloaderVersion = extractDefaultValueFromFile(lines, "reloader_image_version")
+							// If not found, check the root variables.tf file
+							if reloaderVersion == "" {
+								rootVariablesPath := filepath.Join(options.TerraformDir, "..", "..", "variables.tf")
+								if rootData, err := os.ReadFile(rootVariablesPath); err == nil {
+									rootLines := strings.Split(string(rootData), "\n")
+									reloaderVersion = extractDefaultValueFromFile(rootLines, "reloader_image_version")
+								}
+							}
+						}
+
+						// Check the image and version
+						// Get reloader pods - use the correct labels and namespace
+						esoNamespace := "apikeynspace1" // staticly set in locals of basic example
+
+						// assert all values are set
+						if !assert.NotEmpty(t, reloaderImage, "Reloader image is empty") {
+							t.Log("FAILURE: Reloader image is empty - could not find value in variables")
+						}
+
+						if !assert.NotEmpty(t, reloaderVersion, "Reloader version is empty") {
+							t.Log("FAILURE: Reloader version is empty - could not find value in variables")
+						}
+
+						// Get the reloader pods
+						reloaderPods, err := k8s.ListPodsE(t, k8s.NewKubectlOptions("", clusterConfigPath, esoNamespace), metav1.ListOptions{
+							LabelSelector: "provider=stakater,group=com.stakater.platform",
+						})
+						if assert.Nil(t, err, "Error getting reloader pods") {
+							if assert.GreaterOrEqual(t, len(reloaderPods), 1, "Expected at least one reloader pod") {
+								reloaderPod := reloaderPods[0]
+								// Check the image of the reloader pod
+								actualImage := reloaderPod.Spec.Containers[0].Image
+								expectedImage := reloaderImage + ":" + reloaderVersion
+								if !assert.Equal(t, expectedImage, actualImage, "Reloader image does not match expected image") {
+									t.Logf("FAILURE: Reloader image does not match expected image. Expected: %s, Actual: %s", expectedImage, actualImage)
+								}
+							}
+						}
+					}
+
+					// test reloader functionality
 					sampleApp := "./samples/sample.yaml"
 					deploymentName := "example-deployment"
 					namespace := "reloader-test-ns"
@@ -319,6 +398,7 @@ func TestReloaderOperational(t *testing.T) {
 								t.Log("Initial secret value found in logs")
 								t.Log(logs)
 							}
+
 							// update secret with updated secret
 							applyError = k8s.KubectlApplyE(t, ocOptions, updatedSecret)
 							if assert.Nil(t, applyError, "Error applying updated secret") {
@@ -347,7 +427,8 @@ func TestReloaderOperational(t *testing.T) {
 										currentPods, err := GetPodNamesFromDeployment(t, ocOptions, deploymentName)
 										if err != nil {
 											t.Log("Error getting initialPod names")
-											break
+											// Use the labeled break to exit the outer loop
+											continue Loop
 										}
 
 										for _, pod := range currentPods {
@@ -407,3 +488,57 @@ func GetPodNamesFromDeployment(t *testing.T, options *k8s.KubectlOptions, deploy
 
 	return podNames, nil
 }
+
+// Helper function to extract default value from terraform variable definitions
+func extractDefaultValueFromFile(lines []string, variableName string) string {
+	inTargetVariable := false
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "variable") && strings.Contains(line, "\""+variableName+"\"") {
+			inTargetVariable = true
+			continue
+		}
+
+		// We're in the target variable block, look for the default value
+		if inTargetVariable {
+			if strings.HasPrefix(line, "default") {
+				// Extract the value between = and either # or end of line
+				parts := strings.Split(line, "=")
+				if len(parts) > 1 {
+					value := strings.TrimSpace(parts[1])
+
+					// Remove trailing comment if exists
+					if strings.Contains(value, "#") {
+						value = strings.Split(value, "#")[0]
+						value = strings.TrimSpace(value)
+					}
+
+					// Handle quoted strings properly
+					if strings.HasPrefix(value, "\"") {
+						// Extract the string using proper quote handling
+						// This handles any content in quotes, even if it contains special characters
+						re := regexp.MustCompile(`"((?:\\"|[^"])*)"`)
+						matches := re.FindStringSubmatch(value)
+						if len(matches) >= 2 {
+							// Get the content inside the quotes and unescape any quotes
+							value = strings.ReplaceAll(matches[1], "\\\"", "\"")
+						} else {
+							// Fallback to simple trim if regex didn't work
+							value = strings.Trim(value, "\"")
+						}
+					}
+
+					// Remove trailing spaces or commas
+					value = strings.TrimRight(value, " ,")
+					return value
+				}
+			}
+
+			// If we hit a closing brace, we've exited the variable block
+			if line == "}" {
+				inTargetVariable = false
+			}
+		}
+	}
+	return ""
+}

variables.tf

@@ -196,9 +196,10 @@ variable "reloader_custom_values" {
 
 variable "reloader_image" {
   type        = string
-  description = "The reloader image in the format of `[registry-url]/[namespace]/[image]`."
+  description = "The reloader image repository in the format of `[registry-url]/[namespace]/[image]`."
   default     = "ghcr.io/stakater/reloader"
   nullable    = false
+
 }
 
 variable "reloader_image_version" {
@@ -222,7 +223,6 @@ variable "reloader_chart_location" {
 variable "reloader_chart_version" {
   type        = string
   description = "The version of the Reloader Helm chart. Ensure that the chart version is compatible with the image version specified in reloader_image_version."
-  # renovate: datasource=github-releases depName=stakater/Reloader
-  default  = "1.3.0"
-  nullable = false
+  default     = "2.0.0"
+  nullable    = false
 }