Update for Ignition 8.3.3 (#4)

* fix: correct application of supplemental pod labels
* fix: Update redundant health check accepted states
* fix: correct usage info on redundant health check
* feat: add PR workflow artifacting
* chore: bump helm-unittest plugin to 1.0.3
* chore: bump appVersion to 8.3.3

Fixes IGN-14665

Author: thirdgen88

.github/workflows/pull-request.yml

@@ -9,6 +9,7 @@ defaults:
 
 env:
   CT_CHART_DIRS: "."
+  CHART_NAME: "ignition"
 
 jobs:
   lint-and-unittest:
@@ -28,16 +29,40 @@ jobs:
 
       - name: Install helm-unittest plugin
         run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest --version v1.0.0
+          helm plugin install https://github.com/helm-unittest/helm-unittest --version v1.0.3
           helm plugin list
 
       - name: helm-unittest (all changed charts)
         run: |
-          helm unittest ignition
+          helm unittest "${CHART_NAME}"
 
       - name: Set up chart-testing
         uses: helm/chart-testing-action@v2
 
       - name: ct lint
         run: |
           ct lint --all
+
+      - name: Package Helm Chart (unsigned)
+        run: |
+          mkdir build
+          helm package --destination build "${CHART_NAME}"
+
+      - name: Render simple summary with GH hash to build/SUMMARY.md
+        run: |
+          cat << EOF > build/SUMMARY.md
+          # Build Summary
+
+          - Chart: ${CHART_NAME}
+          - Build Date: $(date -u +"%Y-%m-%dT%H:%M:%SZ")
+          - Commit: ${GITHUB_SHA}
+          - Pull Request: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/${{ github.event.pull_request.number }}
+          - Workflow Run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}
+          EOF
+
+      - name: Artifact Packaged Chart
+        uses: actions/upload-artifact@v6
+        with:
+          name: chart-build
+          path: build/
+          retention-days: 30

.github/workflows/release-branch.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Install helm-unittest plugin
         run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest --version v1.0.0
+          helm plugin install https://github.com/helm-unittest/helm-unittest --version v1.0.3
           helm plugin list
 
       - name: Set up chart-testing

ignition/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed an issue where `podLabels` were incorrectly applied to StatefulSet metadata instead of pod metadata.
+
+### Changed
+
+- Bumped _appVersion_ for Ignition to 8.3.3.
+- Modified the redundant health check script to accept some additional states to facilitate better automated upgrades.
+
 ## [0.2.0] - 2025-09-15
 
 ⚠️ **WARNING:** Possible breaking changes related to Ingress and certificate generation.  Please apply extra consideration to these areas while testing upgrades to this version of the chart.

ignition/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: ignition
 description: Ignition by Inductive Automation
 type: application
-version: 0.2.0
-appVersion: "8.3.0"
+version: 0.2.1
+appVersion: "8.3.3"
 kubeVersion: ">= 1.29.0-0"
 home: https://www.inductiveautomation.com
 maintainers:

ignition/scripts/redundant-health-check.sh

@@ -12,7 +12,7 @@ port=${GATEWAY_HTTP_PORT:-8088}
 status_endpoint="http://localhost:${port}/system/gwinfo"
 timeout_secs=3
 expected_context_state=RUNNING
-expected_redundant_state=Good
+expected_redundant_states=(Good OutOfDate Incompatible)
 
 ###############################################################################
 # Invoke a Redundancy-aware Health Check
@@ -23,7 +23,7 @@ function main() {
     exit 1
   fi
 
-  debug "Status endpoint: ${status_endpoint}, expecting context state: ${expected_context_state}, expecting redundant state: ${expected_redundant_state}, timeout: ${timeout_secs}."
+  debug "Status endpoint: ${status_endpoint}, expecting context state: ${expected_context_state}, expecting redundant states: [${expected_redundant_states[*]}], timeout: ${timeout_secs}."
 
   curl_output=$(curl -s --max-time "${timeout_secs}" -L -k -f "${status_endpoint}" 2>&1)
 
@@ -43,17 +43,32 @@ function main() {
       echo "FAILED: ContextStatus is ${gwinfo_fields[ContextStatus]}, expected ${expected_context_state}" >&2
       exit 1
     fi
-  elif [ "${gwinfo_fields[RedundantState]}" != "${expected_redundant_state}" ]; then
+  elif ! validate_redundant_state "${gwinfo_fields[RedundantState]}"; then
     # Check RedundantNodeActiveStatus field
     if [ "${gwinfo_fields[RedundantNodeActiveStatus]}" != "Active" ]; then
-      echo "FAILED: Not Active and RedundantState is ${gwinfo_fields[RedundantState]}, expected ${expected_redundant_state}" >&2
+      echo "FAILED: Not Active and RedundantState is ${gwinfo_fields[RedundantState]}, expected one of: [${expected_redundant_states[*]}]" >&2
       exit 1
     fi
   fi
   debug "SUCCESS"
   exit 0
 }
 
+###############################################################################
+# Validate redundant state against expected states
+###############################################################################
+function validate_redundant_state() {
+  local actual_state="$1"
+  
+  for expected_state in "${expected_redundant_states[@]}"; do
+    if [ "${actual_state,,}" = "${expected_state,,}" ]; then
+      return 0
+    fi
+  done
+  
+  return 1
+}
+
 ###############################################################################
 # Outputs to stderr
 ###############################################################################
@@ -70,23 +85,29 @@ function debug() {
 function usage() {
 # usage redundant-health-check.sh 
   >&2 echo "Usage: $0 [flags] STATUS_ENDPOINT"
-  >&2 echo "Example: ./redundant-health-check.sh -r Good -s RUNNING http://localhost:8088/system/gwinfo"
+  >&2 echo "Example: ./redundant-health-check.sh -s RUNNING http://localhost:8088/system/gwinfo"
   >&2 echo "Flags:"
-  >&2 echo "  -r <state> - Expected redundant state (default: Good)"
-  >&2 echo "  -s <path/to/gan/secret> - The path to the mounted secret containing the webserver TLS certs/keystore (default: ${WEB_TLS_SECRETS_DIR})"
-  >&2 echo "  -d <path/to/data/folder> - The path to the Ignition data folder (default: ${IGNITION_DATA_DIR})"
+  >&2 echo "  -r <state> - Expected redundant state (can be specified multiple times, defaults to 'Good', 'OutOfDate', and 'Incompatible' when omitted)"
+  >&2 echo "  -s <state> - Expected context state, defaults to 'RUNNING'"
+  >&2 echo "  -t <seconds> - Timeout in seconds for the health check request, defaults to 3 seconds"
   >&2 echo "  -h - Print this help message"
   >&2 echo "  -v - Enable verbose output"
 }
 
 # Argument Processing
+first_expected_state=true
 while getopts ":hvr:s:t:" opt; do
   case "$opt" in
   v)
     verbose=1
     ;;
   r)
-    expected_redundant_state=${OPTARG}
+    # If this is the first -r argument, clear the default and start fresh
+    if [ "${first_expected_state}" = true ]; then
+      expected_redundant_states=()
+      first_expected_state=false
+    fi
+    expected_redundant_states+=("${OPTARG}")
     ;;
   s)
     expected_context_state=${OPTARG}

ignition/templates/statefulset.yaml

@@ -5,9 +5,6 @@ metadata:
   name: {{ template "ignition.fullname" . }}-gateway
   labels:
     {{- include "ignition.labels" . | nindent 4 }}
-    {{- with .Values.podLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
   annotations:
     checksum/config: {{ $configChecksum }}
 spec:
@@ -28,6 +25,9 @@ spec:
     metadata:
       labels:
       {{- include "ignition.labels" . | nindent 8 }}
+      {{- with .Values.podLabels }}
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       annotations:
         checksum/config: {{ $configChecksum }}
       {{- with .Values.podAnnotations }}

ignition/tests/statefulset_test.yaml

@@ -132,6 +132,14 @@ tests:
         app.kubernetes.io/instance: ignition
         app.kubernetes.io/version: "8.3.0"
         helm.sh/chart: ignition-0.1.0
+  - isSubset:
+      path: spec.template.metadata.labels
+      content:
+        app.kubernetes.io/name: foo
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/instance: ignition
+        app.kubernetes.io/version: "8.3.0"
+        helm.sh/chart: ignition-0.1.0
         foo: bar
         bar: baz
 # Verify Pod AntiAffinity is applied correctly