DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into pr-improve-baremetal-docs

Browse source
This commit is contained in:
dmotte 2025-01-22 01:34:06 +01:00
commit 07d698f287
17 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GOLANG_VERSION
View file

@ -1 +1 @@
1.23.4 1.23.5

2
build/dev-env.sh
View file

@ -64,7 +64,7 @@ echo "[dev-env] building image"
make build image make build image
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}" docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245} export K8S_VERSION=${K8S_VERSION:-v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30}
KIND_CLUSTER_NAME="ingress-nginx-dev" KIND_CLUSTER_NAME="ingress-nginx-dev"

5
build/run-in-docker.sh
View file

@ -26,14 +26,11 @@ set -o nounset
set -o pipefail set -o pipefail
# temporal directory for the /etc/ingress-controller directory # temporal directory for the /etc/ingress-controller directory
if [[ "$OSTYPE" == darwin* ]] && [[ "$RUNTIME" == podman ]]; then if [[ "$OSTYPE" == darwin* ]]; then
mkdir -p "tmp" mkdir -p "tmp"
INGRESS_VOLUME=$(pwd)/$(mktemp -d tmp/XXXXXX) INGRESS_VOLUME=$(pwd)/$(mktemp -d tmp/XXXXXX)
else else
INGRESS_VOLUME=$(mktemp -d) INGRESS_VOLUME=$(mktemp -d)
if [[ "$OSTYPE" == darwin* ]]; then
INGRESS_VOLUME=/private$INGRESS_VOLUME
fi
fi fi
# make sure directory for SSL cert storage exists under ingress volume # make sure directory for SSL cert storage exists under ingress volume

2
cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
- REPO_INFO=https://github.com/kubernetes/ingress-nginx - REPO_INFO=https://github.com/kubernetes/ingress-nginx

2
go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx module k8s.io/ingress-nginx
go 1.23.4 go 1.23.5
require ( require (
dario.cat/mergo v1.0.1 dario.cat/mergo v1.0.1

2
images/cfssl/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/custom-error-pages/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/custom-error-pages/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages module k8s.io/ingress-nginx/custom-error-pages
go 1.23.4 go 1.23.5
require github.com/prometheus/client_golang v1.20.5 require github.com/prometheus/client_golang v1.20.5

2
images/e2e-test-echo/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/ext-auth-example-authsvc/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module example.com/authsvc module example.com/authsvc
go 1.23.4 go 1.23.5
require k8s.io/apimachinery v0.32.1 require k8s.io/apimachinery v0.32.1

2
images/fastcgi-helloserver/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/httpbun/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/kube-webhook-certgen/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/kube-webhook-certgen/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen module github.com/jet/kube-webhook-certgen
go 1.23.4 go 1.23.5
require ( require (
github.com/onrik/logrus v0.11.0 github.com/onrik/logrus v0.11.0

2
images/nginx/cloudbuild.yaml
View file

@ -4,7 +4,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
images/test-runner/cloudbuild.yaml
View file

@ -2,7 +2,7 @@ options:
# Ignore Prow provided substitutions. # Ignore Prow provided substitutions.
substitution_option: ALLOW_LOOSE substitution_option: ALLOW_LOOSE
steps: steps:
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
env: env:
- REGISTRY=gcr.io/k8s-staging-ingress-nginx - REGISTRY=gcr.io/k8s-staging-ingress-nginx
entrypoint: bash entrypoint: bash

2
magefiles/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/magefiles module k8s.io/ingress-nginx/magefiles
go 1.23.4 go 1.23.5
require ( require (
github.com/blang/semver/v4 v4.0.0 github.com/blang/semver/v4 v4.0.0