Skip to content
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.

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

change to base image with LD_LIBRARY_PATH for opentelemetry #8635

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ endif

REGISTRY ?= gcr.io/k8s-staging-ingress-nginx

BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41
BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209

GOARCH=$(ARCH)

Expand Down
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.2.0
v1.2.1
2 changes: 1 addition & 1 deletion build/dev-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ echo "[dev-env] building image"
make build image
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"

export K8S_VERSION=${K8S_VERSION:-v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6}
export K8S_VERSION=${K8S_VERSION:-v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207}

KIND_CLUSTER_NAME="ingress-nginx-dev"

Expand Down
2 changes: 1 addition & 1 deletion charts/ingress-nginx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ controller:
extraModules: []
## Modules, which are mounted into the core nginx image
# - name: opentelemetry
# image: k8s.gcr.io/ingress-nginx/opentelemetry:v20220415-controller-v1.2.0-beta.0-2-g81c2afd97@sha256:ce61e2cf0b347dffebb2dcbf57c33891d2217c1bad9c0959c878e5be671ef941
# image: k8s.gcr.io/ingress-nginx/opentelemetry:v20220523-ge0b2db057@sha256:a260876fd03d17aa0951a9bb67bfd0140154151e33e23e2dbe030bc732cd0009
#
# The image must contain a `/usr/local/bin/init_module.sh` executable, which
# will be executed as initContainers, to move its config files within the
Expand Down
2 changes: 1 addition & 1 deletion images/echo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ build: ensure-buildx
--platform=${PLATFORMS} $(OUTPUT) \
--progress=$(PROGRESS) \
--pull \
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41 \
--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209 \
--build-arg LUAROCKS_VERSION=3.8.0 \
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
-t $(IMAGE):$(TAG) rootfs
Expand Down
2 changes: 1 addition & 1 deletion images/nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ This image provides a default configuration file with no backend servers.
_Using docker_

```console
docker run -v /some/nginx.conf:/etc/nginx/nginx.conf:ro k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41
docker run -v /some/nginx.conf:/etc/nginx/nginx.conf:ro k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209
```

2 changes: 1 addition & 1 deletion images/nginx/rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: nginx
image: k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41
image: k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209
ports:
- containerPort: 80
- containerPort: 443
2 changes: 1 addition & 1 deletion images/test-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ REGISTRY ?= local

IMAGE = $(REGISTRY)/e2e-test-runner

NGINX_BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41
NGINX_BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209

# required to enable buildx
export DOCKER_CLI_EXPERIMENTAL=enabled
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const SlowEchoService = "slow-echo"
const HTTPBinService = "httpbin"

// NginxBaseImage use for testing
const NginxBaseImage = "k8s.gcr.io/ingress-nginx/nginx:cd6f88af3f976a180ed966dadf273473ae768dfa@sha256:18f91105e4099941d2efee71a8ec52c6ef7702d5f7e8214b7cb5f25cc10a0b41"
const NginxBaseImage = "k8s.gcr.io/ingress-nginx/nginx:ac3bbaf068d099e438444fbfa1b3bd1c31a6a183@sha256:03e983f8adb9fdb56bc0b258c9d17e24a183c0728111102b21a31756b5031209"

type deploymentOptions struct {
namespace string
Expand Down