SC-130842: Fix support bundle goldpinger namespace

.github/workflows/ci.yaml

@@ -761,24 +761,6 @@ jobs:
           export RELEASE_YAML_DIR=e2e/kots-release-install
           ./scripts/ci-release-app.sh
 
-          # then install a version with alternate unsupported overrides
-          export EC_VERSION="${{ needs.output-vars.outputs.ec_version }}"
-          export APP_VERSION="appver-${SHORT_SHA}-unsupported-overrides"
-          export RELEASE_YAML_DIR=e2e/kots-release-unsupported-overrides
-          ./scripts/ci-release-app.sh
-
-          # then install a version with additional failing host preflights
-          export EC_VERSION="${{ needs.output-vars.outputs.ec_version }}"
-          export APP_VERSION="appver-${SHORT_SHA}-failing-preflights"
-          export RELEASE_YAML_DIR=e2e/kots-release-install-failing-preflights
-          ./scripts/ci-release-app.sh
-
-          # then install a version with additional warning host preflights
-          export EC_VERSION="${{ needs.output-vars.outputs.ec_version }}"
-          export APP_VERSION="appver-${SHORT_SHA}-warning-preflights"
-          export RELEASE_YAML_DIR=e2e/kots-release-install-warning-preflights
-          ./scripts/ci-release-app.sh
-
           # promote a release with improved dr support
           export EC_VERSION="${{ needs.output-vars.outputs.ec_version }}"
           export APP_VERSION="appver-${SHORT_SHA}-legacydr"
@@ -892,31 +874,17 @@ jobs:
         test:
           - TestPreflights
           - TestPreflightsNoexec
-          - TestMaterialize
-          - TestHostPreflightCustomSpec
-          - TestHostPreflightInBuiltSpec
           - TestSingleNodeInstallation
-          - TestSingleNodeInstallationAlmaLinux8
-          - TestSingleNodeInstallationDebian11
-          - TestSingleNodeInstallationDebian12
-          - TestSingleNodeInstallationCentos9Stream
           - TestSingleNodeUpgradePreviousStable
-          - TestInstallFromReplicatedApp
           - TestUpgradeFromReplicatedAppPreviousK0s
-          - TestResetAndReinstall
-          - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeInstallation
           - TestMultiNodeHAInstallation
           - TestSingleNodeDisasterRecovery
           - TestSingleNodeLegacyDisasterRecovery
           - TestSingleNodeResumeDisasterRecovery
           - TestMultiNodeHADisasterRecovery
           - TestSingleNodeInstallationNoopUpgrade
-          - TestCustomCIDR
-          - TestLocalArtifactMirror
-          - TestMultiNodeReset
           - TestCollectSupportBundle
-          - TestUnsupportedOverrides
           - TestHostCollectSupportBundleInCluster
           - TestInstallWithConfigValues
     steps:
@@ -982,13 +950,9 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          - TestResetAndReinstallAirgap
           - TestSingleNodeAirgapUpgrade
           - TestSingleNodeAirgapUpgradeSelinux
           - TestSingleNodeAirgapUpgradeConfigValues
-          - TestSingleNodeAirgapUpgradeCustomCIDR
-          - TestMultiNodeAirgapUpgrade
-          - TestMultiNodeAirgapUpgradeSameK0s
           - TestMultiNodeAirgapUpgradePreviousStable
           - TestMultiNodeAirgapHAInstallation
           - TestSingleNodeAirgapDisasterRecovery

.github/workflows/release-prod.yaml

@@ -341,24 +341,6 @@ jobs:
           export APP_VERSION="appver-${{ github.ref_name }}"
           export RELEASE_YAML_DIR=e2e/kots-release-install	
           ./scripts/ci-release-app.sh
-
-          # then install a version with alternate unsupported overrides
-          export EC_VERSION="${{ github.ref_name }}"
-          export APP_VERSION="appver-${{ github.ref_name }}-unsupported-overrides"
-          export RELEASE_YAML_DIR=e2e/kots-release-unsupported-overrides
-          ./scripts/ci-release-app.sh
-
-          # then install a version with additional failing host preflights
-          export EC_VERSION="${{ github.ref_name }}"
-          export APP_VERSION="appver-${{ github.ref_name }}-failing-preflights"
-          export RELEASE_YAML_DIR=e2e/kots-release-install-failing-preflights
-          ./scripts/ci-release-app.sh
-
-          # then install a version with additional warning host preflights
-          export EC_VERSION="${{ github.ref_name }}"
-          export APP_VERSION="appver-${{ github.ref_name }}-warning-preflights"
-          export RELEASE_YAML_DIR=e2e/kots-release-install-warning-preflights
-          ./scripts/ci-release-app.sh
 
           # then a noop upgrade
           export EC_VERSION="${{ github.ref_name }}"
@@ -508,30 +490,15 @@ jobs:
         test:
           - TestPreflights
           - TestPreflightsNoexec
-          - TestMaterialize
-          - TestHostPreflightCustomSpec
-          - TestHostPreflightInBuiltSpec
           - TestSingleNodeInstallation
-          - TestSingleNodeInstallationAlmaLinux8
-          - TestSingleNodeInstallationDebian11
-          - TestSingleNodeInstallationDebian12
-          - TestSingleNodeInstallationCentos9Stream
           - TestSingleNodeUpgradePreviousStable
-          - TestInstallFromReplicatedApp
-          - TestUpgradeFromReplicatedApp
-          - TestResetAndReinstall
-          - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeInstallation
           - TestMultiNodeHAInstallation
           - TestSingleNodeDisasterRecovery
           - TestSingleNodeResumeDisasterRecovery
           - TestMultiNodeHADisasterRecovery
           - TestSingleNodeInstallationNoopUpgrade
-          - TestCustomCIDR
-          - TestLocalArtifactMirror
-          - TestMultiNodeReset
           - TestCollectSupportBundle
-          - TestUnsupportedOverrides
           - TestHostCollectSupportBundleInCluster
           - TestInstallWithConfigValues
     steps:
@@ -597,13 +564,9 @@ jobs:
       fail-fast: false
       matrix:
         test:
-          - TestResetAndReinstallAirgap
           - TestSingleNodeAirgapUpgrade
           - TestSingleNodeAirgapUpgradeSelinux
           - TestSingleNodeAirgapUpgradeConfigValues
-          - TestSingleNodeAirgapUpgradeCustomCIDR
-          - TestMultiNodeAirgapUpgrade
-          - TestMultiNodeAirgapUpgradeSameK0s
           - TestMultiNodeAirgapUpgradePreviousStable
           - TestMultiNodeAirgapHAInstallation
           - TestSingleNodeAirgapDisasterRecovery

api/controllers/app/controller.go

@@ -210,6 +210,17 @@ func NewAppController(opts ...AppControllerOption) (*AppController, error) {
 		if err != nil {
 			return nil, fmt.Errorf("patch app config values: %w", err)
 		}
+		// Warm the template engine cache with the existing values
+		_, err = controller.appConfigManager.TemplateConfig(controller.configValues, false, false)
+		if err != nil {
+			return nil, fmt.Errorf("template config: %w", err)
+		}
+	} else {
+		// Warm the template engine cache with empty values
+		_, err := controller.appConfigManager.TemplateConfig(make(types.AppConfigValues), false, false)
+		if err != nil {
+			return nil, fmt.Errorf("template config: %w", err)
+		}
 	}
 
 	if controller.appPreflightManager == nil {

api/controllers/app/tests/test_suite.go

@@ -149,12 +149,14 @@ func (s *AppControllerTestSuite) TestPatchAppConfigValues() {
 			for _, tt := range tests {
 				t.Run(tt.name, func(t *testing.T) {
 
-					appConfigManager := &appconfig.MockAppConfigManager{}
 					appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 					appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 					appInstallManager := &appinstallmanager.MockAppInstallManager{}
 					sm := scenario.createSM(tt.currentState)
 
+					appConfigManager := &appconfig.MockAppConfigManager{}
+					appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 					controller, err := appcontroller.NewAppController(
 						appcontroller.WithStateMachine(sm),
 						appcontroller.WithAppConfigManager(appConfigManager),
@@ -426,10 +428,13 @@ func (s *AppControllerTestSuite) TestRunAppPreflights() {
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
 
-			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			sm := s.CreateInstallStateMachine(tt.currentState)
+
+			appConfigManager := &appconfig.MockAppConfigManager{}
+			appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			controller, err := appcontroller.NewAppController(
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithAppConfigManager(appConfigManager),
@@ -499,12 +504,14 @@ func (s *AppControllerTestSuite) TestGetAppInstallStatus() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
 			sm := s.CreateInstallStateMachine(states.StateNew)
 
+			appConfigManager := &appconfig.MockAppConfigManager{}
+			appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			controller, err := appcontroller.NewAppController(
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithAppConfigManager(appConfigManager),
@@ -527,6 +534,7 @@ func (s *AppControllerTestSuite) TestGetAppInstallStatus() {
 				assert.Equal(t, expectedAppInstall, result)
 			}
 
+			appConfigManager.AssertExpectations(s.T())
 			appInstallManager.AssertExpectations(s.T())
 		})
 	}
@@ -681,12 +689,14 @@ func (s *AppControllerTestSuite) TestInstallApp() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
 			sm := s.CreateInstallStateMachine(tt.currentState)
 
+			appConfigManager := &appconfig.MockAppConfigManager{}
+			appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			controller, err := appcontroller.NewAppController(
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithAppConfigManager(appConfigManager),
@@ -820,13 +830,15 @@ func (s *AppControllerTestSuite) TestUpgradeApp() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
 			appUpgradeManager := &appupgrademanager.MockAppUpgradeManager{}
 			sm := s.CreateUpgradeStateMachine(tt.currentState)
 
+			appConfigManager := &appconfig.MockAppConfigManager{}
+			appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			controller, err := appcontroller.NewAppController(
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithAppConfigManager(appConfigManager),
@@ -896,13 +908,15 @@ func (s *AppControllerTestSuite) TestGetAppUpgradeStatus() {
 
 	for _, tt := range tests {
 		s.T().Run(tt.name, func(t *testing.T) {
-			appConfigManager := &appconfig.MockAppConfigManager{}
 			appPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			appReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 			appInstallManager := &appinstallmanager.MockAppInstallManager{}
 			appUpgradeManager := &appupgrademanager.MockAppUpgradeManager{}
 			sm := s.CreateUpgradeStateMachine(states.StateNew)
 
+			appConfigManager := &appconfig.MockAppConfigManager{}
+			appConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			controller, err := appcontroller.NewAppController(
 				appcontroller.WithStateMachine(sm),
 				appcontroller.WithAppConfigManager(appConfigManager),

api/controllers/kubernetes/install/controller_test.go

@@ -219,7 +219,9 @@ func TestConfigureInstallation(t *testing.T) {
 
 			mockManager := &installation.MockInstallationManager{}
 			mockMetricsReporter := &metrics.MockReporter{}
+
 			mockStore := &store.MockStore{}
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
 
 			tt.setupMock(mockManager, mockInstallation, tt.config, mockStore, mockMetricsReporter)
 
@@ -421,7 +423,10 @@ func TestSetupInfra(t *testing.T) {
 			mockInfraManager := &infra.MockInfraManager{}
 			mockMetricsReporter := &metrics.MockReporter{}
 			mockStore := &store.MockStore{}
+
 			mockAppConfigManager := &appconfig.MockAppConfigManager{}
+			mockAppConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			tt.setupMocks(ki, mockInstallationManager, mockInfraManager, mockMetricsReporter, mockStore, mockAppConfigManager)
 
 			appController, err := appcontroller.NewAppController(

api/controllers/linux/install/controller_test.go

@@ -399,7 +399,9 @@ func TestConfigureInstallation(t *testing.T) {
 
 			mockManager := &installation.MockInstallationManager{}
 			mockMetricsReporter := &metrics.MockReporter{}
+
 			mockStore := &store.MockStore{}
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
 
 			tt.setupMock(mockManager, rc, tt.config, mockStore, mockMetricsReporter)
 
@@ -732,6 +734,9 @@ func TestRunHostPreflights(t *testing.T) {
 
 			tt.setupMocks(mockPreflightManager, rc, mockMetricsReporter, mockStore)
 
+			// Mock GetConfigValues call that happens during controller initialization
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
+
 			controller, err := NewInstallController(
 				WithRuntimeConfig(rc),
 				WithStateMachine(sm),
@@ -1152,10 +1157,12 @@ func TestSetupInfra(t *testing.T) {
 			mockInfraManager := &infra.MockInfraManager{}
 			mockMetricsReporter := &metrics.MockReporter{}
 			mockStore := &store.MockStore{}
-			mockAppConfigManager := &appconfig.MockAppConfigManager{}
 			mockAppPreflightManager := &apppreflightmanager.MockAppPreflightManager{}
 			mockAppReleaseManager := &appreleasemanager.MockAppReleaseManager{}
 
+			mockAppConfigManager := &appconfig.MockAppConfigManager{}
+			mockAppConfigManager.On("TemplateConfig", types.AppConfigValues{}, false, false).Return(types.AppConfig{}, nil)
+
 			tt.setupMocks(rc, mockPreflightManager, mockInstallationManager, mockInfraManager, mockAppConfigManager, mockMetricsReporter, mockStore)
 
 			appController, err := appcontroller.NewAppController(
@@ -1397,6 +1404,9 @@ func TestProcessAirgap(t *testing.T) {
 
 			tt.setupMocks(mockAirgapManager, mockInstallationManager, expectedRegistrySettings, rc)
 
+			// Mock GetConfigValues call that happens during controller initialization
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
+
 			controller, err := NewInstallController(
 				WithRuntimeConfig(rc),
 				WithStateMachine(sm),

api/controllers/linux/upgrade/controller_test.go

@@ -81,9 +81,11 @@ func TestUpgradeInfra(t *testing.T) {
 			rc.SetManagerPort(9001)
 
 			mockInfraManager := &infra.MockInfraManager{}
-			mockStore := &store.MockStore{}
 			mockInstallationManager := &installation.MockInstallationManager{}
 
+			mockStore := &store.MockStore{}
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
+
 			tt.setupMocks(rc, mockInfraManager, mockInstallationManager)
 
 			sm := NewStateMachine(
@@ -187,7 +189,9 @@ func TestGetInfra(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockInfraManager := &infra.MockInfraManager{}
+
 			mockStore := &store.MockStore{}
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
 
 			tt.setupMock(mockInfraManager)
 
@@ -321,9 +325,11 @@ func TestReportingHandlers(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockMetricsReporter := &metrics.MockReporter{}
-			mockStore := &store.MockStore{}
 			mockInfraManager := &infra.MockInfraManager{}
 
+			mockStore := &store.MockStore{}
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
+
 			tt.setupMocks(mockMetricsReporter, mockStore)
 
 			// Mock RequiresUpgrade which is called during controller initialization
@@ -452,6 +458,8 @@ func TestProcessAirgap(t *testing.T) {
 
 			tt.setupMocks(mockAirgapManager, mockInstallationManager, expectedRegistrySettings, rc)
 
+			mockStore.AppConfigMockStore.On("GetConfigValues").Return(types.AppConfigValues{}, nil)
+
 			controller, err := NewUpgradeController(
 				WithRuntimeConfig(rc),
 				WithStateMachine(sm),