C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Florian Ruynat 2021-01-26 17:22:34 +01:00 committed by GitHub
parent 774ec49396
commit 9007d6621a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/lint.yml
View file

@ -14,7 +14,7 @@ vagrant-validate:
stage: unit-tests stage: unit-tests
tags: [light] tags: [light]
variables: variables:
VAGRANT_VERSION: 2.2.10 VAGRANT_VERSION: 2.2.14
script: script:
- ./tests/scripts/vagrant-validate.sh - ./tests/scripts/vagrant-validate.sh
except: ['triggers', 'master'] except: ['triggers', 'master']

14
.gitlab-ci/terraform.yml
View file

@ -56,21 +56,21 @@
tf-validate-openstack: tf-validate-openstack:
extends: .terraform_validate extends: .terraform_validate
variables: variables:
TF_VERSION: 0.12.29 TF_VERSION: 0.12.30
PROVIDER: openstack PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
tf-validate-packet: tf-validate-packet:
extends: .terraform_validate extends: .terraform_validate
variables: variables:
TF_VERSION: 0.12.29 TF_VERSION: 0.12.30
PROVIDER: packet PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
tf-validate-aws: tf-validate-aws:
extends: .terraform_validate extends: .terraform_validate
variables: variables:
TF_VERSION: 0.12.29 TF_VERSION: 0.12.30
PROVIDER: aws PROVIDER: aws
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
@ -119,7 +119,7 @@ tf-0.14.x-validate-aws:
# tf-packet-ubuntu16-default: # tf-packet-ubuntu16-default:
# extends: .terraform_apply # extends: .terraform_apply
# variables: # variables:
# TF_VERSION: 0.12.29 # TF_VERSION: 0.12.30
# PROVIDER: packet # PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME # CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1" # TF_VAR_number_of_k8s_masters: "1"
@ -133,7 +133,7 @@ tf-0.14.x-validate-aws:
# tf-packet-ubuntu18-default: # tf-packet-ubuntu18-default:
# extends: .terraform_apply # extends: .terraform_apply
# variables: # variables:
# TF_VERSION: 0.12.29 # TF_VERSION: 0.12.30
# PROVIDER: packet # PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME # CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1" # TF_VAR_number_of_k8s_masters: "1"
@ -190,7 +190,7 @@ tf-elastx_ubuntu18-calico:
when: on_success when: on_success
variables: variables:
<<: *elastx_variables <<: *elastx_variables
TF_VERSION: 0.12.29 TF_VERSION: 0.12.30
PROVIDER: openstack PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60" ANSIBLE_TIMEOUT: "60"
@ -235,7 +235,7 @@ tf-ovh_ubuntu18-calico:
environment: ovh environment: ovh
variables: variables:
<<: *ovh_variables <<: *ovh_variables
TF_VERSION: 0.12.29 TF_VERSION: 0.12.30
PROVIDER: openstack PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60" ANSIBLE_TIMEOUT: "60"

4
README.md
View file

@ -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 - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.1.1
- [multus](https://github.com/intel/multus-cni) v3.6.0 - [multus](https://github.com/intel/multus-cni) v3.6.0
- [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.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 - Application
- [ambassador](https://github.com/datawire/ambassador): v1.5 - [ambassador](https://github.com/datawire/ambassador): v1.5
- [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11 - [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 - [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 - [cert-manager](https://github.com/jetstack/cert-manager) v0.16.1
- [coredns](https://github.com/coredns/coredns) v1.7.0 - [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). 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).

2
docs/packet.md
View file

@ -40,7 +40,7 @@ Grab the latest version of Terraform and install it.
```bash ```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" 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 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 ## Download Kubespray

4
roles/download/defaults/main.yml
View file

@ -73,7 +73,7 @@ typha_enabled: false
flannel_version: "v0.13.0" flannel_version: "v0.13.0"
cni_version: "v0.9.0" cni_version: "v0.9.0"
weave_version: 2.8.0 weave_version: 2.8.1
pod_infra_version: "3.3" pod_infra_version: "3.3"
cilium_version: "v1.8.6" cilium_version: "v1.8.6"
kube_ovn_version: "v1.5.2" 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_repo: "{{ docker_image_repo }}/rancher/local-path-provisioner"
local_path_provisioner_image_tag: "v0.0.19" local_path_provisioner_image_tag: "v0.0.19"
ingress_nginx_controller_image_repo: "{{ kube_image_repo }}/ingress-nginx/controller" 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_repo: "{{ quay_image_repo }}/datawire/ambassador-operator"
ingress_ambassador_image_tag: "v1.2.9" ingress_ambassador_image_tag: "v1.2.9"
alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller" alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller"

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/clusterrole-ingress-nginx.yml.j2
View file

@ -15,7 +15,7 @@ rules:
verbs: ["get"] verbs: ["get"]
- apiGroups: [""] - apiGroups: [""]
resources: ["services"] resources: ["services"]
verbs: ["get", "list", "update", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: ["extensions","networking.k8s.io"] - apiGroups: ["extensions","networking.k8s.io"]
resources: ["ingresses"] resources: ["ingresses"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]

5
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/role-ingress-nginx.yml.j2
View file

@ -16,7 +16,7 @@ rules:
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["services"] resources: ["services"]
verbs: ["get", "list", "update", "watch"] verbs: ["get", "list", watch"]
- apiGroups: ["extensions", "networking.k8s.io"] - apiGroups: ["extensions", "networking.k8s.io"]
resources: ["ingresses"] resources: ["ingresses"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]
@ -37,9 +37,6 @@ rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["configmaps"] resources: ["configmaps"]
verbs: ["create"] verbs: ["create"]
- apiGroups: [""]
resources: ["endpoints"]
verbs: ["create", "get", "update"]
- apiGroups: [""] - apiGroups: [""]
resources: ["events"] resources: ["events"]
verbs: ["create", "patch"] verbs: ["create", "patch"]

2
test-infra/vagrant-docker/Dockerfile
View file

@ -3,7 +3,7 @@
ARG KUBESPRAY_VERSION ARG KUBESPRAY_VERSION
FROM quay.io/kubespray/kubespray:${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 ENV VAGRANT_DEFAULT_PROVIDER=libvirt
RUN apt-get update && apt-get install -y wget libvirt-dev openssh-client rsync git RUN apt-get update && apt-get install -y wget libvirt-dev openssh-client rsync git

2
tests/testcases/100_check-k8s-conformance.yml
View file

@ -1,7 +1,7 @@
--- ---
- hosts: kube-master[0] - hosts: kube-master[0]
vars: vars:
sonobuoy_version: 0.19.0 sonobuoy_version: 0.20.0
sonobuoy_arch: amd64 sonobuoy_arch: amd64
sonobuoy_parallel: 30 sonobuoy_parallel: 30
sonobuoy_path: /usr/local/bin/sonobuoy sonobuoy_path: /usr/local/bin/sonobuoy