Update nginx, minor weave and misc CI tools (vagrant/terraform) (#7215)

2021-01-26 17:22:34 +01:00 · 2021-01-26 17:22:34 +01:00 · 9007d6621a
parent 774ec49396
commit 9007d6621a
9 changed files with 17 additions and 20 deletions
--- a/.gitlab-ci/lint.yml
+++ b/.gitlab-ci/lint.yml
@ -14,7 +14,7 @@ vagrant-validate:
  stage: unit-tests
  tags: [light]
  variables:
-    VAGRANT_VERSION: 2.2.10
+    VAGRANT_VERSION: 2.2.14
  script:
    - ./tests/scripts/vagrant-validate.sh
  except: ['triggers', 'master']
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@ -56,21 +56,21 @@
 tf-validate-openstack:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.30
    PROVIDER: openstack
    CLUSTER: $CI_COMMIT_REF_NAME

 tf-validate-packet:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.30
    PROVIDER: packet
    CLUSTER: $CI_COMMIT_REF_NAME

 tf-validate-aws:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.30
    PROVIDER: aws
    CLUSTER: $CI_COMMIT_REF_NAME

@ -119,7 +119,7 @@ tf-0.14.x-validate-aws:
 # tf-packet-ubuntu16-default:
 #   extends: .terraform_apply
 #   variables:
-#     TF_VERSION: 0.12.29
+#     TF_VERSION: 0.12.30
 #     PROVIDER: packet
 #     CLUSTER: $CI_COMMIT_REF_NAME
 #     TF_VAR_number_of_k8s_masters: "1"
@ -133,7 +133,7 @@ tf-0.14.x-validate-aws:
 # tf-packet-ubuntu18-default:
 #   extends: .terraform_apply
 #   variables:
-#     TF_VERSION: 0.12.29
+#     TF_VERSION: 0.12.30
 #     PROVIDER: packet
 #     CLUSTER: $CI_COMMIT_REF_NAME
 #     TF_VAR_number_of_k8s_masters: "1"
@ -190,7 +190,7 @@ tf-elastx_ubuntu18-calico:
  when: on_success
  variables:
    <<: *elastx_variables
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.30
    PROVIDER: openstack
    CLUSTER: $CI_COMMIT_REF_NAME
    ANSIBLE_TIMEOUT: "60"
@ -235,7 +235,7 @@ tf-ovh_ubuntu18-calico:
  environment: ovh
  variables:
    <<: *ovh_variables
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.30
    PROVIDER: openstack
    CLUSTER: $CI_COMMIT_REF_NAME
    ANSIBLE_TIMEOUT: "60"
--- a/README.md
+++ b/README.md
@ -131,14 +131,14 @@ Note: Upstart/SysV init based OS types are not supported.
  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.1.1
  - [multus](https://github.com/intel/multus-cni) v3.6.0
  - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
-  - [weave](https://github.com/weaveworks/weave) v2.8.0
+  - [weave](https://github.com/weaveworks/weave) v2.8.1
 - Application
  - [ambassador](https://github.com/datawire/ambassador): v1.5
  - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
  - [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11
  - [cert-manager](https://github.com/jetstack/cert-manager) v0.16.1
  - [coredns](https://github.com/coredns/coredns) v1.7.0
-  - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.41.2
+  - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.43.0

 Note: The list of available docker version is 18.09, 19.03 and 20.10. The recommended docker version is 19.03. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).

--- a/docs/packet.md
+++ b/docs/packet.md
@ -40,7 +40,7 @@ Grab the latest version of Terraform and install it.
 ```bash
 echo "https://releases.hashicorp.com/terraform/$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')/terraform_$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')_linux_amd64.zip"
 sudo yum install unzip
-sudo unzip terraform_0.12.29_linux_amd64.zip -d /usr/local/bin/
+sudo unzip terraform_0.12.30_linux_amd64.zip -d /usr/local/bin/
 ```

 ## Download Kubespray
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@ -73,7 +73,7 @@ typha_enabled: false

 flannel_version: "v0.13.0"
 cni_version: "v0.9.0"
-weave_version: 2.8.0
+weave_version: 2.8.1
 pod_infra_version: "3.3"
 cilium_version: "v1.8.6"
 kube_ovn_version: "v1.5.2"
@ -487,7 +487,7 @@ rbd_provisioner_image_tag: "v2.1.1-k8s1.11"
 local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner"
 local_path_provisioner_image_tag: "v0.0.19"
 ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller"
-ingress_nginx_controller_image_tag: "v0.41.2"
+ingress_nginx_controller_image_tag: "v0.43.0"
 ingress_ambassador_image_repo: "{{ quay_image_repo }}/datawire/ambassador-operator"
 ingress_ambassador_image_tag: "v1.2.9"
 alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller"
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2
@ -15,7 +15,7 @@ rules:
    verbs: ["get"]
  - apiGroups: [""]
    resources: ["services"]
-    verbs: ["get", "list", "update", "watch"]
+    verbs: ["get", "list", "watch"]
  - apiGroups: ["extensions","networking.k8s.io"]
    resources: ["ingresses"]
    verbs: ["get", "list", "watch"]
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
@ -16,7 +16,7 @@ rules:
    verbs: ["get", "list", "watch"]
  - apiGroups: [""]
    resources: ["services"]
-    verbs: ["get", "list", "update", "watch"]
+    verbs: ["get", "list", watch"]
  - apiGroups: ["extensions", "networking.k8s.io"]
    resources: ["ingresses"]
    verbs: ["get", "list", "watch"]
@ -37,9 +37,6 @@ rules:
  - apiGroups: [""]
    resources: ["configmaps"]
    verbs: ["create"]
-  - apiGroups: [""]
-    resources: ["endpoints"]
-    verbs: ["create", "get", "update"]
  - apiGroups: [""]
    resources: ["events"]
    verbs: ["create", "patch"]
--- a/test-infra/vagrant-docker/Dockerfile
+++ b/test-infra/vagrant-docker/Dockerfile
@ -3,7 +3,7 @@
 ARG KUBESPRAY_VERSION
 FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION}

-ENV VAGRANT_VERSION=2.2.10
+ENV VAGRANT_VERSION=2.2.14
 ENV VAGRANT_DEFAULT_PROVIDER=libvirt

 RUN apt-get update && apt-get install -y wget libvirt-dev openssh-client rsync git
--- a/tests/testcases/100_check-k8s-conformance.yml
+++ b/tests/testcases/100_check-k8s-conformance.yml
@ -1,7 +1,7 @@
 ---
 - hosts: kube-master[0]
  vars:
-    sonobuoy_version: 0.19.0
+    sonobuoy_version: 0.20.0
    sonobuoy_arch: amd64
    sonobuoy_parallel: 30
    sonobuoy_path: /usr/local/bin/sonobuoy