diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21abfb62977aac010c3571a97deb4e42e2cb4acc..7c155e0b94d3c780cb692d0a91c8f897efe90aef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -375,17 +375,6 @@ gce_centos-weave-kubeadm-sep: except: ['triggers'] only: [/^pr-.*$/] -gce_ubuntu-flannel-ha: - stage: deploy-part2 - <<: *job - <<: *gce - variables: - <<: *gce_variables - <<: *ubuntu_flannel_variables - when: on_success - except: ['triggers'] - only: [/^pr-.*$/] - ### MANUAL JOBS gce_ubuntu-weave-sep: @@ -429,7 +418,6 @@ gce_centos7-flannel-addons-triggers: when: on_success only: ['triggers'] - gce_ubuntu-weave-sep-triggers: stage: deploy-part2 <<: *job @@ -483,6 +471,16 @@ gce_ubuntu-canal-kubeadm-triggers: when: on_success only: ['triggers'] +gce_ubuntu-flannel-ha: + stage: deploy-part2 + <<: *job + <<: *gce + variables: + <<: *gce_variables + <<: *ubuntu_flannel_variables + when: manual + except: ['triggers'] + gce_centos-weave-kubeadm-triggers: stage: deploy-part2 <<: *job diff --git a/README.md b/README.md index b23f158f77a1debb5d288afc6fb9ef03c59ba0f7..daccaaec9a676b7cbdf40055fb2b7155774a3044 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Supported Components -------------------- - Core - - [kubernetes](https://github.com/kubernetes/kubernetes) v1.13.0 + - [kubernetes](https://github.com/kubernetes/kubernetes) v1.13.1 - [etcd](https://github.com/coreos/etcd) v3.2.24 - [docker](https://www.docker.com/) v18.06 (see note) - [rkt](https://github.com/rkt/rkt) v1.21.0 (see Note 2) diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml index 81ee23aa8ee4c15dbb28968bbc305ac2ce88512a..eb7269b85b5e169bafceca7ebffe491234cc87b0 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml @@ -19,7 +19,7 @@ kube_users_dir: "{{ kube_config_dir }}/users" kube_api_anonymous_auth: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.13.0 +kube_version: v1.13.1 # kubernetes image repo define kube_image_repo: "gcr.io/google-containers" diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index c566acd6b2ed3a2037d1c5e2d54400cd5d5a14c9..3b22fcba00d68c2f2ffd1f2597eee1012b781c5b 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -35,7 +35,7 @@ download_delegate: "{% if download_localhost %}localhost{% else %}{{groups['kube image_arch: "{{host_architecture | default('amd64')}}" # Versions -kube_version: v1.13.0 +kube_version: v1.13.1 kubeadm_version: "{{ kube_version }}" etcd_version: v3.2.24 @@ -70,6 +70,7 @@ cni_download_url: "https://github.com/containernetworking/plugins/releases/downl # Checksums hyperkube_checksums: + v1.13.1: f64c4328d3853f3e5680e7d296b0f3ed25e67ff98321867309edea100ebb4fd7 v1.13.0: 754f1baae5dc2ba29afc66e1f5d3b676ee59cd5c40ccce813092408d53bde3d9 v1.12.3: 600aad3f0d016716abd85931239806193ffbe95f2edfdcea11532d518ae5cdb1 v1.12.2: 566dfed398c20c9944f8999d6370cb584cb8c228b3c5881137b6b3d9306e4b06 @@ -91,6 +92,7 @@ hyperkube_checksums: v1.10.1: 6e0642ad6bae68dc81b8d1c9efa18e265e17e23da1895862823cafac08c0344c v1.10.0: b5575b2fb4266754c1675b8cd5d9b6cac70f3fee7a05c4e80da3a9e83e58c57e kubeadm_checksums: + v1.13.1: 438173bfa0b7014ecae994c5b9e1f27e1328ab971a3fdb06a393a8095a176ba0 v1.13.0: f5366206416dc4cfc840a7add2289957b56ccc479cc1b74f7397a4df995d6b06 v1.12.3: c675aa3be82754b3f8dfdde2a1526a72986713312d46d898e65cb564c6aa8ad4 v1.12.2: 51bc4bfd1d934a27245111c0ad1f793d5147ed15389415a1509502f23fcfa642 diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 369201abe90508192c70af9e8a432e8c72baf37e..4ac7755baba20df58be810f26a4e2869b43e5a3f 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -12,7 +12,7 @@ is_atomic: false disable_swap: true ## Change this to use another Kubernetes version, e.g. a current beta release -kube_version: v1.13.0 +kube_version: v1.13.1 ## Kube Proxy mode One of ['iptables','ipvs'] kube_proxy_mode: ipvs