diff --git a/internal/generator/ingress.go b/internal/generator/ingress.go index 4a51883d..133f8c32 100644 --- a/internal/generator/ingress.go +++ b/internal/generator/ingress.go @@ -160,7 +160,7 @@ func generateAutogenRoutes( return err } } - insecure := "Allow" + insecure := "Redirect" if buildValues.LagoonYAML.Routes.Autogenerate.Insecure != "" { insecure = buildValues.LagoonYAML.Routes.Autogenerate.Insecure } diff --git a/internal/generator/ingress_test.go b/internal/generator/ingress_test.go index c3d68b60..a9500de6 100644 --- a/internal/generator/ingress_test.go +++ b/internal/generator/ingress_test.go @@ -926,7 +926,7 @@ func Test_generateAutogenRoutes(t *testing.T) { ComposeService: "nginx", Autogenerated: true, TLSAcme: helpers.BoolPtr(true), - Insecure: helpers.StrPtr("Allow"), + Insecure: helpers.StrPtr("Redirect"), AlternativeNames: []string{}, Labels: map[string]string{ "app.kubernetes.io/instance": "nginx", @@ -980,7 +980,7 @@ func Test_generateAutogenRoutes(t *testing.T) { Autogenerated: true, TLSAcme: helpers.BoolPtr(true), IngressClass: "nginx", - Insecure: helpers.StrPtr("Allow"), + Insecure: helpers.StrPtr("Redirect"), AlternativeNames: []string{}, Labels: map[string]string{ "app.kubernetes.io/instance": "nginx", @@ -1040,7 +1040,7 @@ func Test_generateAutogenRoutes(t *testing.T) { Autogenerated: true, TLSAcme: helpers.BoolPtr(true), IngressClass: "custom-nginx", - Insecure: helpers.StrPtr("Allow"), + Insecure: helpers.StrPtr("Redirect"), AlternativeNames: []string{}, Labels: map[string]string{ "app.kubernetes.io/instance": "nginx", @@ -1111,7 +1111,7 @@ func Test_generateAutogenRoutes(t *testing.T) { ComposeService: "nginx", Autogenerated: true, TLSAcme: helpers.BoolPtr(true), - Insecure: helpers.StrPtr("Allow"), + Insecure: helpers.StrPtr("Redirect"), AlternativeNames: []string{}, Labels: map[string]string{ "app.kubernetes.io/instance": "nginx", @@ -1136,7 +1136,7 @@ func Test_generateAutogenRoutes(t *testing.T) { ComposeService: "node", Autogenerated: true, TLSAcme: helpers.BoolPtr(true), - Insecure: helpers.StrPtr("Allow"), + Insecure: helpers.StrPtr("Redirect"), AlternativeNames: []string{}, Labels: map[string]string{ "app.kubernetes.io/instance": "node", diff --git a/internal/testdata/basic/autogen-templates/ingress-1/nginx.yaml b/internal/testdata/basic/autogen-templates/ingress-1/nginx.yaml index 321def9a..533a10f6 100644 --- a/internal/testdata/basic/autogen-templates/ingress-1/nginx.yaml +++ b/internal/testdata/basic/autogen-templates/ingress-1/nginx.yaml @@ -5,14 +5,14 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: feature/skycms-10626-update-permissions-by-term lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: nginx diff --git a/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/nginx.yaml b/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/nginx.yaml index 8367f1d7..1d1040d5 100644 --- a/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/nginx.yaml +++ b/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/nginx.yaml @@ -5,14 +5,14 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: nginx diff --git a/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/node.yaml b/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/node.yaml index fd605f6e..d87ef8c9 100644 --- a/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/node.yaml +++ b/internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/node.yaml @@ -5,14 +5,14 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: node diff --git a/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml b/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml index 53382f4b..00972edc 100644 --- a/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml +++ b/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml @@ -5,13 +5,13 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: drush-first lagoon.sh/version: v2.7.x nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: nginx diff --git a/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml b/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml index 92b78554..73771e9d 100644 --- a/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml +++ b/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml @@ -5,13 +5,13 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: feature/migration lagoon.sh/version: v2.7.x nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: nginx-php diff --git a/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml b/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml index 8b45801b..e63019c3 100644 --- a/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml +++ b/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml @@ -5,13 +5,13 @@ metadata: annotations: fastly.amazee.io/watch: "false" idling.amazee.io/disable-request-verification: "false" - ingress.kubernetes.io/ssl-redirect: "false" + ingress.kubernetes.io/ssl-redirect: "true" kubernetes.io/tls-acme: "true" lagoon.sh/branch: feature lagoon.sh/version: v2.7.x nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; - nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: app.kubernetes.io/instance: nginx diff --git a/internal/testdata/node/lagoon.autogen-5.yml b/internal/testdata/node/lagoon.autogen-5.yml index ac0754c8..39d892bd 100644 --- a/internal/testdata/node/lagoon.autogen-5.yml +++ b/internal/testdata/node/lagoon.autogen-5.yml @@ -3,6 +3,7 @@ docker-compose-yaml: internal/testdata/node/docker-compose.yml routes: autogenerate: enabled: true + insecure: "Allow" environment_variables: git_sha: "true"