Fixes for findings while testing the upgrade path from v0.26.0 => v1.…

…0.0 (#870)
gimlet-io · Sep 13, 2024 · dd0e2e0 · dd0e2e0
1 parent a17abaa
commit dd0e2e0
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 46 deletions.
diff --git a/pkg/dashboard/server/session/session.go b/pkg/dashboard/server/session/session.go
@@ -98,7 +98,7 @@ func MustUser() func(next http.Handler) http.Handler {
 			ctx := r.Context()
 			_, userSet := ctx.Value("user").(*model.User)
 			if !userSet {
-				if r.URL.Path == "/settings/installed" {
+				if r.URL.Path == "/installed" {
 					http.Redirect(w, r, "/auth?"+r.URL.RawQuery, http.StatusSeeOther)
 				}
 				http.Error(w, http.StatusText(401), 401)

diff --git a/web/src/views/deployWizzard/deployWizzard.jsx b/web/src/views/deployWizzard/deployWizzard.jsx
@@ -47,9 +47,7 @@ export function DeployWizzard(props) {
 
   const deployHandler = new DeployHandler(owner, repo, gimletClient, store)
 
-  const [registries, setRegistries] = useState()
-  const [preferredDomain, setPreferredDomain] = useState()
-  const [ingressAnnotations, setIngressAnnotations] = useState()
+  const [stackConfigDerivedValues, setStackConfigDerivedValues] = useState()
 
   store.subscribe(() => {
     setEnvs(reduxState.envs)
@@ -87,9 +85,12 @@ export function DeployWizzard(props) {
   useEffect(() => {
     gimletClient.getStackConfig(env)
       .then(data => {
-        setRegistries(configuredRegistries(data.stackConfig, data.stackDefinition))
-        setPreferredDomain(extractPreferredDomain(data.stackConfig, data.stackDefinition))
-        setIngressAnnotations(extractIngressAnnotations(data.stackConfig, data.stackDefinition))
+        setStackConfigDerivedValues({
+            "registries": configuredRegistries(data.stackConfig, data.stackDefinition),
+            "preferredDomain": extractPreferredDomain(data.stackConfig, data.stackDefinition),
+            "ingressAnnotations": extractIngressAnnotations(data.stackConfig, data.stackDefinition),
+          }
+        )
       }, () => {/* Generic error handler deals with it */ });
 
     gimletClient.getDefaultDeploymentTemplates()
@@ -205,22 +206,36 @@ export function DeployWizzard(props) {
   }
 
   useEffect(() => {
-    if(!selectedTemplate || !registries) {
+    if(!selectedTemplate || !stackConfigDerivedValues) {
       return
     }
 
-    setPatchedTemplate(patchUIWidgets(selectedTemplate, registries, preferredDomain))
-  }, [selectedTemplate, registries, preferredDomain]);
+    setPatchedTemplate(
+      patchUIWidgets(selectedTemplate, stackConfigDerivedValues.registries, stackConfigDerivedValues.preferredDomain)
+    )
+  }, [selectedTemplate, stackConfigDerivedValues]);
 
   useEffect(() => {
-    if(!selectedTemplate || !preferredDomain || !ingressAnnotations) {
+    if(!selectedTemplate || !stackConfigDerivedValues) {
       return
     }
 
-    setConfigFile(newConfig(configFile ? configFile.app : repo, configFile ? configFile.namespace : "default", env, selectedTemplate.reference.chart, repoName, preferredDomain, settings.scmUrl, ingressAnnotations, false))
+    setConfigFile(
+      newConfig(
+        configFile ? configFile.app : repo,
+        configFile ? configFile.namespace : "default",
+        env,
+        selectedTemplate.reference.chart,
+        repoName,
+        stackConfigDerivedValues.preferredDomain,
+        settings.scmUrl,
+        stackConfigDerivedValues.ingressAnnotations,
+        false
+      )
+    )
     setDefaultConfigFile({})
     setRenderId(uuidv4())
-  }, [selectedTemplate, preferredDomain, ingressAnnotations]);
+  }, [selectedTemplate, stackConfigDerivedValues]);
 
   // useEffect(() => {
   //   console.log(configFile)

diff --git a/web/src/views/envConfig/envConfig.jsx b/web/src/views/envConfig/envConfig.jsx
@@ -38,9 +38,7 @@ export function EnvConfig(props) {
   const [navigation, setNavigation] = useState([])
   const [showModal, setShowModal] = useState(false)
 
-  const [registries, setRegistries] = useState()
-  const [preferredDomain, setPreferredDomain] = useState()
-  const [ingressAnnotations, setIngressAnnotations] = useState()
+  const [stackConfigDerivedValues, setStackConfigDerivedValues] = useState()
   const [templateLoadError, setTemplateLoadError] = useState(false)
 
   store.subscribe(() => {
@@ -52,9 +50,12 @@ export function EnvConfig(props) {
   useEffect(() => {
     gimletClient.getStackConfig(env)
       .then(data => {
-        setRegistries(configuredRegistries(data.stackConfig, data.stackDefinition))
-        setPreferredDomain(extractPreferredDomain(data.stackConfig, data.stackDefinition))
-        setIngressAnnotations(extractIngressAnnotations(data.stackConfig, data.stackDefinition))
+        setStackConfigDerivedValues({
+          "registries": configuredRegistries(data.stackConfig, data.stackDefinition),
+          "preferredDomain": extractPreferredDomain(data.stackConfig, data.stackDefinition),
+          "ingressAnnotations": extractIngressAnnotations(data.stackConfig, data.stackDefinition),
+        }
+      )
       }, () => {/* Generic error handler deals with it */ });
 
     gimletClient.getRepoMetas(owner, repo)
@@ -99,12 +100,12 @@ export function EnvConfig(props) {
   }, []);
 
   useEffect(() => {
-    if(!selectedTemplate || !registries) {
+    if(!selectedTemplate || !stackConfigDerivedValues) {
       return
     }
 
-    setPatchedTemplate(patchUIWidgets(selectedTemplate, registries, preferredDomain))
-  }, [selectedTemplate, registries, preferredDomain]);
+    setPatchedTemplate(patchUIWidgets(selectedTemplate, stackConfigDerivedValues.registries, stackConfigDerivedValues.preferredDomain))
+  }, [selectedTemplate, stackConfigDerivedValues]);
 
   useEffect(() => {
     if (configFile && configFile.values.ingress) {
@@ -117,8 +118,8 @@ export function EnvConfig(props) {
               ...prevState.values.ingress,
               annotations: {
                 ...prevState.values.ingress.annotations,
-                "nginx.ingress.kubernetes.io/auth-url": "https://auth"+preferredDomain+"/oauth2/auth",
-                "nginx.ingress.kubernetes.io/auth-signin": "https://auth"+preferredDomain+"/oauth2/start?rd=/redirect/$http_host$escaped_request_uri",
+                "nginx.ingress.kubernetes.io/auth-url": "https://auth"+stackConfigDerivedValues.preferredDomain+"/oauth2/auth",
+                "nginx.ingress.kubernetes.io/auth-signin": "https://auth"+stackConfigDerivedValues.preferredDomain+"/oauth2/start?rd=/redirect/$http_host$escaped_request_uri",
               }
             }
           },
@@ -133,7 +134,7 @@ export function EnvConfig(props) {
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [configFile && configFile.values.ingress && configFile.values.ingress.protectWithOauthProxy, preferredDomain])
+  }, [configFile && configFile.values.ingress && configFile.values.ingress.protectWithOauthProxy, stackConfigDerivedValues])
 
   const setAppName = (appName) => {
     setConfigFile(prevState => ({
@@ -326,17 +327,29 @@ export function EnvConfig(props) {
   }
 
   useEffect(() => {
-    if(!selectedTemplate || !preferredDomain || !ingressAnnotations) {
+    if(!selectedTemplate || !stackConfigDerivedValues) {
       return
     }
 
     if (action === "new-preview") {
-      setConfigFile(newConfig(configFile ? configFile.app : config, configFile ? configFile.namespace : "default", env, selectedTemplate.reference.chart, repoName, preferredDomain, scmUrl, ingressAnnotations, true))
+      setConfigFile(
+        newConfig(
+          configFile ? configFile.app : config,
+          configFile ? configFile.namespace : "default",
+          env,
+          selectedTemplate.reference.chart,
+          repoName,
+          stackConfigDerivedValues.preferredDomain,
+          scmUrl,
+          stackConfigDerivedValues.ingressAnnotations,
+          true
+        )
+      )
       setSavedConfigFile({})
     }
 
     setNavigation(translateToNavigation(selectedTemplate))
-  }, [selectedTemplate, preferredDomain, ingressAnnotations]);
+  }, [selectedTemplate, stackConfigDerivedValues]);
 
 
   const setDeploymentTemplate = (template) => {
@@ -678,24 +691,14 @@ export function robustName(str) {
 }
 
 export function newConfig(configName, namespace, env, chartRef, repoName, preferredDomain, scmUrl, ingressAnnotations, preview) {
-  let sanitizedRepoName = robustName(repoName)
-  sanitizedRepoName = sanitizedRepoName.length > 55 ? sanitizedRepoName.slice(0, 55) : sanitizedRepoName
-
   const config = {
     app: configName,
     namespace: namespace,
     env:       env,
     chart: chartRef,
     values: {
       gitRepository: repoName,
-      gitSha:        "{{ .SHA }}",
-      ingress: {
-        host: `${sanitizedRepoName}${preferredDomain}`,
-        tlsEnabled: true,
-        annotations: {
-          ...ingressAnnotations
-        }
-      }
+      gitSha:        "{{ .SHA }}"
     },
   }
 
@@ -704,10 +707,10 @@ export function newConfig(configName, namespace, env, chartRef, repoName, prefer
 
   if (oneChart && !staticSite) {
     config.values.image = {
-      repository: "127.0.0.1:32447/{{ .APP }}",
-      tag:        "{{ .SHA }}",
-      strategy:   "buildpacks",
-      registry:   "dockerRegistry",
+      repository: "nginx",
+      tag:        "1.27",
+      strategy:   "static",
+      registry:   "public",
     }
     config.values.resources = {
       ignoreLimits: true,
@@ -722,6 +725,19 @@ export function newConfig(configName, namespace, env, chartRef, repoName, prefer
     config.preview = true
   }
 
+  if (preferredDomain) {
+    let sanitizedRepoName = robustName(repoName)
+    sanitizedRepoName = sanitizedRepoName.length > 55 ? sanitizedRepoName.slice(0, 55) : sanitizedRepoName
+
+    config.values.ingress = {
+      host: `${sanitizedRepoName}${preferredDomain}`,
+      tlsEnabled: true,
+      annotations: {
+        ...ingressAnnotations
+      }
+    }
+  }
+
   return config
 }
 

diff --git a/web/src/views/envConfig/imageWidget.jsx b/web/src/views/envConfig/imageWidget.jsx
@@ -41,7 +41,7 @@ export default function ImageWidget(props) {
         setImage({
           ...image,
           "strategy": strategy,
-          "registry": "dockerRegistry",
+          "registry": "containerizedRegistry",
           "repository": "127.0.0.1:32447/{{ .APP }}",
           "tag": "{{ .SHA }}",
           "dockerfile": "Dockerfile"
@@ -51,7 +51,7 @@ export default function ImageWidget(props) {
         setImage({
           ...image,
           "strategy": strategy,
-          "registry": "dockerRegistry",
+          "registry": "containerizedRegistry",
           "repository": "127.0.0.1:32447/{{ .APP }}",
           "tag": "{{ .SHA }}",
           "dockerfile": ""
@@ -63,7 +63,7 @@ export default function ImageWidget(props) {
           "strategy": strategy,
           "registry": "public",
           "repository": "nginx",
-          "tag": "1.25",
+          "tag": "1.27",
           "dockerfile": ""
         })
     }