fix missing admin console branding (#393)

cbodonnell · web-flow · commit 33014a1e0889 · 2024-02-20T10:08:26.000-05:00
diff --git a/e2e/scripts/check-installation-state.sh b/e2e/scripts/check-installation-state.sh
@@ -34,6 +34,9 @@ main() {
     echo "ensure that installation is installed"
     wait_for_installation
     kubectl get installations --no-headers | grep -q "Installed"
+
+    echo "ensure that the admin console branding is available"
+    kubectl get cm -n kotsadm kotsadm-application-metadata
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
diff --git a/e2e/scripts/check-postupgrade-state.sh b/e2e/scripts/check-postupgrade-state.sh
@@ -74,6 +74,9 @@ main() {
         kubectl logs -n embedded-cluster -l app.kubernetes.io/name=embedded-cluster-operator --tail=100
         exit 1
     fi
+
+    echo "ensure that the admin console branding is available"
+    kubectl get cm -n kotsadm kotsadm-application-metadata
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
diff --git a/pkg/addons/adminconsole/adminconsole.go b/pkg/addons/adminconsole/adminconsole.go
@@ -39,7 +39,7 @@ var (
 )
 
 // protectedFields are helm values that are not overwritten when upgrading the addon.
-var protectedFields = []string{"automation", "embeddedClusterID"}
+var protectedFields = []string{"automation", "embeddedClusterID", "kotsApplication"}
 
 const DEFAULT_ADMIN_CONSOLE_NODE_PORT = 30000
 

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ main() {`
`34`	`34`	`echo "ensure that installation is installed"`
`35`	`35`	`wait_for_installation`
`36`	`36`	`kubectl get installations --no-headers \| grep -q "Installed"`
	`37`	`+`
	`38`	`+ echo "ensure that the admin console branding is available"`
	`39`	`+ kubectl get cm -n kotsadm kotsadm-application-metadata`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ main() {`
`74`	`74`	`kubectl logs -n embedded-cluster -l app.kubernetes.io/name=embedded-cluster-operator --tail=100`
`75`	`75`	`exit 1`
`76`	`76`	`fi`
	`77`	`+`
	`78`	`+ echo "ensure that the admin console branding is available"`
	`79`	`+ kubectl get cm -n kotsadm kotsadm-application-metadata`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ var (`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`// protectedFields are helm values that are not overwritten when upgrading the addon.`
`42`		`-var protectedFields = []string{"automation", "embeddedClusterID"}`
	`42`	`+var protectedFields = []string{"automation", "embeddedClusterID", "kotsApplication"}`
`43`	`43`
`44`	`44`	`const DEFAULT_ADMIN_CONSOLE_NODE_PORT = 30000`
`45`	`45`