diff --git a/WORKSPACE b/WORKSPACE index 339d2a6a4..7dea3e23b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,9 +11,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "com_google_protobuf", - sha256 = "c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db", - strip_prefix = "protobuf-3.17.3", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz"], + sha256 = "14e8042b5da37652c92ef6a2759e7d2979d295f60afd7767825e3de68c856c54", + strip_prefix = "protobuf-3.18.0", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.18.0.tar.gz"], ) load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") @@ -21,13 +21,12 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() ## Load rules_go and dependencies - http_archive( name = "io_bazel_rules_go", - sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b", + sha256 = "8e968b5fcea1d2d64071872b12737bbb5514524ee5f0a4f54f5920266c261acb", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.28.0/rules_go-v0.28.0.zip", ], ) @@ -71,9 +70,9 @@ http_archive( ## Load rules_docker and dependencies, for working with docker images http_archive( name = "io_bazel_rules_docker", - sha256 = "59d5b42ac315e7eadffa944e86e90c2990110a1c8075f1cd145f487e999d22b3", - strip_prefix = "rules_docker-0.17.0", - urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.17.0/rules_docker-v0.17.0.tar.gz"], + sha256 = "5d31ad261b9582515ff52126bf53b954526547a3e26f6c25a9d64c48a31e45ac", + strip_prefix = "rules_docker-0.18.0", + urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.18.0/rules_docker-v0.18.0.tar.gz"], ) load( diff --git a/devel/addon/ingressnginx/BUILD.bazel b/devel/addon/ingressnginx/BUILD.bazel index 9a5fa0d29..2091c5099 100644 --- a/devel/addon/ingressnginx/BUILD.bazel +++ b/devel/addon/ingressnginx/BUILD.bazel @@ -11,9 +11,9 @@ container_bundle( # Ingress image that works on Kubernetes v1.19 -> (including v1.22) container_bundle( - name = "bundle_v1.0.0-alpha.2", + name = "bundle_v1.0.2", images = { - "k8s.gcr.io/ingress-nginx/controller:v1.0.0-alpha.2": "@io_kubernetes_ingress-nginx_new//image", + "k8s.gcr.io/ingress-nginx/controller:v1.0.2": "@io_kubernetes_ingress-nginx_new//image", }, tags = ["manual"], ) diff --git a/devel/addon/ingressnginx/install.sh b/devel/addon/ingressnginx/install.sh index 883b81b36..27a04bae6 100755 --- a/devel/addon/ingressnginx/install.sh +++ b/devel/addon/ingressnginx/install.sh @@ -35,6 +35,7 @@ fi # Release name to use with Helm RELEASE_NAME="${RELEASE_NAME:-ingress-nginx}" IMAGE_TAG="" +HELM_CHART="" # Require helm, kubectl and yq available on PATH check_tool kubectl @@ -54,9 +55,11 @@ export PATH="${bindir}/hack/bin/:$PATH" # without passing the K8S_VERSION env var. k8s_version=$(kubectl version -oyaml | yq e '.serverVersion | .major +"."+ .minor' -) if [[ $k8s_version =~ 1\.22 ]]; then - IMAGE_TAG="v1.0.0-alpha.2" + IMAGE_TAG="v1.0.2" + HELM_CHART="4.0.3" else IMAGE_TAG="v0.48.1" + HELM_CHART="3.34.0" fi require_image "k8s.gcr.io/ingress-nginx/controller:${IMAGE_TAG}" "//devel/addon/ingressnginx:bundle_${IMAGE_TAG}" @@ -71,7 +74,7 @@ helm repo update helm upgrade \ --install \ --wait \ - --version 3.34.0 \ + --version "${HELM_CHART}" \ --namespace "${NAMESPACE}" \ --set controller.image.digest="" \ --set controller.image.tag="${IMAGE_TAG}" \ diff --git a/test/e2e/images.bzl b/test/e2e/images.bzl index 663393701..8200ac459 100644 --- a/test/e2e/images.bzl +++ b/test/e2e/images.bzl @@ -49,8 +49,8 @@ def install(): name = "io_kubernetes_ingress-nginx_new", registry = "k8s.gcr.io", repository = "ingress-nginx/controller", - tag = "v1.0.0-alpha.2", - digest = "sha256:90f417ffd979f6493ea302f6757763365263d2f8112447139dffa97d927f5dfb", + tag = "v1.0.2", + digest = "sha256:8c0abb209aaef63631d1c85add422ca51848ccee2f87aea06558d37bda1c8e91", ) ## Fetch traefik for use during e2e tests.