Skip to content

Commit

Permalink
Prepare for release v1.6.12
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer committed Sep 30, 2020
1 parent 832efd9 commit 520a8dd
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/cilium-actions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project: "https://github.com/cilium/cilium/projects/122"
project: "https://github.com/cilium/cilium/projects/128"
column: "In progress"
auto-label:
- "kind/backports"
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Liu Qun <qunliu@zyhx-group.com>
Madhu Challa <challa@gmail.com>
Matthew Gumport <me@gum.pt>
Michael Vorburger <vorburger@redhat.com>
Neela Jacques <neela@isovalent.com> <68304471+Neelajacques@users.noreply.github.com>
Peiqi Shi <uestc.shi@gmail.com>
Sergey Generalov <sergey@genbit.ru>
Tam Mach <sayboras@yahoo.com>
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ Michal Rostecki mrostecki@opensuse.org
Michi Mutsuzaki michi@isovalent.com
Moritz Johner beller.moritz@googlemail.com
Moshe Immerman moshe.immerman@vitalitygroup.com
Nathan Bird njbird@infiniteenergy.com
Nathan Taylor ntaylor1781@gmail.com
Neela Jacques neela@isovalent.com
Nirmoy Das ndas@suse.de
Patrice Peterson patrice.peterson@mailbox.org
Patrick Mahoney pmahoney@greenkeytech.com
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Changelog

## v1.6.12

Summary of Changes
------------------

**Minor Changes:**
* Add hidden --k8s-sync-timeout to set the timeout for initial Kubernetes synchronization (Backport PR #12823, Upstream PR #12822, @joestringer)
* envoy: Require Node only on the first request of a stream (Backport PR #13334, Upstream PR #12522, @jrajahalme)
* Istio integration has been updated to Istio release 1.5.9. (Backport PR #12888, Upstream PR #12861, @jrajahalme)
* k8s: update k8s dependencies to 1.16.15 (#12667, @aanm)

**Bugfixes:**
* Envoy is updated to release 1.14.5 (Backport PR #13334, Upstream PR #13332, @jrajahalme)
* node-init restartPods should use docker if /etc/crictl.yaml not found (Backport PR #13054, Upstream PR #12894, @UnwashedMeme)

**Misc Changes:**
* Add Kubernetes compatibility documentation (Backport PR #12799, Upstream PR #12783, @aanm)
* contrib: Add release helper scripts for preparing micro releases (Backport PR #13250, Upstream PR #13044, @joestringer)
* doc: update #ebpf Slack channel name (Backport PR #12799, Upstream PR #12766, @qmonnet)
* docs/metrics: Correct label typos in metrics.rst (Backport PR #13054, Upstream PR #12901, @sayboras)
* docs: limit copybutton to content area only (Backport PR #13054, Upstream PR #12997, @genbit)
* Upgrade Cilium docs theme version (Backport PR #13054, Upstream PR #12996, @Neelajacques)
* 1.6 special ci-fixing backport (#13111, @nebril)

## v1.6.11

Summary of Changes
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.11
1.6.12
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: cilium
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2-0"
description: Helm chart for Cilium
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/agent/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: agent
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for cilium-agent DaemonSet
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/config/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: config
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for Cilium configuration
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/managed-etcd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: managed-etcd
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for managed etcd
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/nodeinit/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: nodeinit
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for node initialization
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: operator
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for cilium-operator deployment
keywords:
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/charts/preflight/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: preflight
version: 1.6.11
appVersion: 1.6.11
version: 1.6.12
appVersion: 1.6.12
tillerVersion: ">=2.7.2"
description: Helm chart for pre-flight functionality
keywords:
Expand Down
12 changes: 6 additions & 6 deletions install/kubernetes/cilium/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
dependencies:
- name: agent
version: 1.6.11
version: 1.6.12
condition: agent.enabled
- name: config
version: 1.6.11
version: 1.6.12
condition: config.enabled
- name: operator
version: 1.6.11
version: 1.6.12
condition: operator.enabled
- name: managed-etcd
version: 1.6.11
version: 1.6.12
condition: global.etcd.managed
- name: preflight
version: 1.6.11
version: 1.6.12
condition: preflight.enabled
- name: nodeinit
version: 1.6.11
version: 1.6.12
condition: global.nodeinit.enabled
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ global:
registry: docker.io/cilium

# tag is the container image tag to use
tag: v1.6.11
tag: v1.6.12

# pullPolicy is the container image pull policy
pullPolicy: IfNotPresent
Expand Down
6 changes: 3 additions & 3 deletions install/kubernetes/quick-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ spec:
key: custom-cni-conf
name: cilium-config
optional: true
image: "docker.io/cilium/cilium:v1.6.11"
image: "docker.io/cilium/cilium:v1.6.12"
imagePullPolicy: IfNotPresent
lifecycle:
postStart:
Expand Down Expand Up @@ -455,7 +455,7 @@ spec:
key: wait-bpf-mount
name: cilium-config
optional: true
image: "docker.io/cilium/cilium:v1.6.11"
image: "docker.io/cilium/cilium:v1.6.12"
imagePullPolicy: IfNotPresent
name: clean-cilium-state
securityContext:
Expand Down Expand Up @@ -629,7 +629,7 @@ spec:
key: identity-allocation-mode
name: cilium-config
optional: true
image: "docker.io/cilium/operator:v1.6.11"
image: "docker.io/cilium/operator:v1.6.12"
imagePullPolicy: IfNotPresent
name: cilium-operator
livenessProbe:
Expand Down

0 comments on commit 520a8dd

Please sign in to comment.