Skip to content

feat: align default values for autogen/custom routes insecure behavior #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: align default values for autogen/custom routes insecure behavior #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/generator/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func generateAutogenRoutes(
return err
}
}
insecure := "Allow"
insecure := "Redirect"
if buildValues.LagoonYAML.Routes.Autogenerate.Insecure != "" {
insecure = buildValues.LagoonYAML.Routes.Autogenerate.Insecure
}
Expand Down
10 changes: 5 additions & 5 deletions internal/generator/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/basic/autogen-templates/ingress-1/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/basic/autogen-templates/test29-autogenerated-pathroutes/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions internal/testdata/node/lagoon.autogen-5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ docker-compose-yaml: internal/testdata/node/docker-compose.yml
routes:
autogenerate:
enabled: true
insecure: "Allow"

environment_variables:
git_sha: "true"
Expand Down
Loading