
* Release version v1.10.0 * set deploy url to v1-10-0 in docs * quotes around numbers fort ports definitions * Bump dorny/paths-filter from 3.0.1 to 3.0.2 Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/dorny/paths-filter/releases) - [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md) - [Commits](ebc4d7e9eb...de90cc6fb3
) --- updated-dependencies: - dependency-name: dorny/paths-filter dependency-type: direct:production update-type: version-update:semver-patch ... * Bump aquasecurity/trivy-action from 0.17.0 to 0.18.0 Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](84384bd6e7...062f259268
) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action dependency-type: direct:production update-type: version-update:semver-minor ... * Bump github/codeql-action from 3.24.5 to 3.24.6 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.5 to 3.24.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](47b3d888fe...8a470fddaf
) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... * Bump github.com/prometheus/common from 0.48.0 to 0.49.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.49.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](https://github.com/prometheus/common/compare/v0.48.0...v0.49.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... * Bump docker/setup-buildx-action from 3.0.0 to 3.1.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](f95db51fdd...0d103c3126
) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... * Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... * Bump actions/download-artifact from 4.1.2 to 4.1.4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.2 to 4.1.4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](eaceaf801f...c850b930e6
) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... * Update README.md remove older version, left latest for release train. * docs: update the 404 link to FAQ * bump golang * golangci-lint update, ci cleanup, group dependabot updates * bump golangci-lint to v1.56.x * cleanup empty lines * group dependabot updates * run on job changes as well * remove deprecated checks * fix lints and format * Bump github.com/prometheus/common from 0.49.0 to 0.50.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.49.0 to 0.50.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](https://github.com/prometheus/common/compare/v0.49.0...v0.50.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... * Bump the all group with 1 update Bumps the all group with 1 update: [google.golang.org/grpc](https://github.com/grpc/grpc-go). Updates `google.golang.org/grpc` from 1.62.0 to 1.62.1 - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... * Bump the all group with 1 update Bumps the all group with 1 update: [actions/add-to-project](https://github.com/actions/add-to-project). Updates `actions/add-to-project` from 0.5.0 to 0.6.0 - [Release notes](https://github.com/actions/add-to-project/releases) - [Commits](31b3f3ccdc...0609a2702e
) --- updated-dependencies: - dependency-name: actions/add-to-project dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... * Bump github.com/onsi/ginkgo/v2 from 2.15.0 to 2.16.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.15.0 to 2.16.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.15.0...v2.16.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... --------- Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> Co-authored-by: longwuyuan <longwuyuan@gmail.com> Co-authored-by: Bartosz Fenski <fenio@debian.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Grinish <grinish@gmail.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
108 lines
2.9 KiB
Go
108 lines
2.9 KiB
Go
/*
|
|
Copyright 2020 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package controller
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
networking "k8s.io/api/networking/v1"
|
|
"k8s.io/ingress-nginx/pkg/apis/ingress"
|
|
)
|
|
|
|
var (
|
|
pathTypeExact = networking.PathTypeExact
|
|
pathTypePrefix = networking.PathTypePrefix
|
|
)
|
|
|
|
// updateServerLocations inspects the generated locations configuration for a server
|
|
// normalizing the path and adding an additional exact location when is possible
|
|
func updateServerLocations(locations []*ingress.Location) []*ingress.Location {
|
|
newLocations := []*ingress.Location{}
|
|
|
|
// get Exact locations to check if one already exists
|
|
exactLocations := map[string]*ingress.Location{}
|
|
for _, location := range locations {
|
|
if *location.PathType == pathTypeExact {
|
|
exactLocations[location.Path] = location
|
|
}
|
|
}
|
|
|
|
for _, location := range locations {
|
|
// location / does not require any update
|
|
if location.Path == rootLocation {
|
|
newLocations = append(newLocations, location)
|
|
continue
|
|
}
|
|
|
|
location.IngressPath = location.Path
|
|
|
|
// only Prefix locations could require an additional location block
|
|
if *location.PathType != pathTypePrefix {
|
|
newLocations = append(newLocations, location)
|
|
continue
|
|
}
|
|
|
|
// locations with rewrite or using regular expressions are not modified
|
|
if needsRewrite(location) || location.Rewrite.UseRegex {
|
|
newLocations = append(newLocations, location)
|
|
continue
|
|
}
|
|
|
|
// If exists an Exact location is not possible to create a new one.
|
|
if _, alreadyExists := exactLocations[location.Path]; alreadyExists {
|
|
// normalize path. Must end in /
|
|
location.Path = normalizePrefixPath(location.Path)
|
|
newLocations = append(newLocations, location)
|
|
continue
|
|
}
|
|
|
|
var el ingress.Location = *location
|
|
|
|
// normalize path. Must end in /
|
|
location.Path = normalizePrefixPath(location.Path)
|
|
newLocations = append(newLocations, location)
|
|
|
|
// add exact location
|
|
exactLocation := &el
|
|
exactLocation.PathType = &pathTypeExact
|
|
|
|
newLocations = append(newLocations, exactLocation)
|
|
}
|
|
|
|
return newLocations
|
|
}
|
|
|
|
func normalizePrefixPath(path string) string {
|
|
if path == rootLocation {
|
|
return rootLocation
|
|
}
|
|
|
|
if !strings.HasSuffix(path, "/") {
|
|
return fmt.Sprintf("%v/", path)
|
|
}
|
|
|
|
return path
|
|
}
|
|
|
|
func needsRewrite(location *ingress.Location) bool {
|
|
if location.Rewrite.Target != "" && location.Rewrite.Target != location.Path {
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|