Skip to content

Commit

Permalink
Prepare for release v1.6.11
Browse files Browse the repository at this point in the history
Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer committed Aug 3, 2020
1 parent 99d0b3a commit 6eab0a0
Show file tree
Hide file tree
Showing 15 changed files with 64 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/118"
project: "https://github.com/cilium/cilium/projects/122"
column: "In progress"
auto-label:
- "kind/backports"
Expand Down
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@ Ifeanyi Ubah <ify1992@yahoo.com>
Jarno Rajahalme <jarno@covalent.io>
Jerry J. Muzsik <jerrymuzsik@icloud.com>
Jomen Xiao <jomenxiao@gmail.com>
Jonathan Davies <jpds@protonmail.com>
Joshua Roppo <joshroppo@gmail.com>
Junli Ou <oujunli306@gmail.com>
Liu Qun <qunliu@zyhx-group.com>
Madhu Challa <challa@gmail.com>
Matthew Gumport <me@gum.pt>
Michael Vorburger <vorburger@redhat.com>
Peiqi Shi <uestc.shi@gmail.com>
Sergey Generalov <sergey@genbit.ru>
Tam Mach <sayboras@yahoo.com>
Thomas Graf <thomas@cilium.io>
Zhu Yan <hackzhuyan@gmail.com>
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Jarno Rajahalme jarno@covalent.io
Jean Raby jean@raby.sh
Jerry J. Muzsik jerrymuzsik@icloud.com
Jess Frazelle acidburn@microsoft.com
JieJhih Jhang jiejhihjhang@gmail.com
Jiong Wang jiong.wang@netronome.com
Joe Farrell joe2farrell@gmail.com
Joe Stringer joe@cilium.io
Expand Down Expand Up @@ -94,6 +95,7 @@ Nathan Taylor ntaylor1781@gmail.com
Nirmoy Das ndas@suse.de
Patrice Peterson patrice.peterson@mailbox.org
Patrick Mahoney pmahoney@greenkeytech.com
Paul Chaignon paul@cilium.io
Paweł Prażak pawelprazak@users.noreply.github.com
Peiqi Shi uestc.shi@gmail.com
Peter Slovak slovak.peto@gmail.com
Expand Down Expand Up @@ -122,6 +124,7 @@ Steven Normore snormore@digitalocean.com
Strukov Anton anstrukov@luxoft.com
Swaminathan Vasudevan svasudevan@suse.com
Taeung Song treeze.taeung@gmail.com
Tam Mach sayboras@yahoo.com
Tasdik Rahman prodicus@outlook.com
Thomas Bachman tbachman@yahoo.com
Thomas Graf thomas@cilium.io
Expand Down
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# Changelog

## v1.6.11

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

**Bugfixes:**
* bpf: Fix monitor aggregation for 'from-network' (Backport PR #12724, Upstream PR #12559, @joestringer)
* Fix manual endpoint regeneration via command line (Backport PR #12713, Upstream PR #12524, @christarazi)
* Fix regression to identity garbage collection due to identity allocation flag in cilium operator (#12496, @brb)
* Fix string slice type CLI arguments (Backport PR #12483, Upstream PR #12457, @JieJhih)
* Fix toGroups CRD to address validation errors (Backport PR #12483, Upstream PR #12440, @lbernail)
* Various etcd bug fixes (#12748, #12753, @tgraf)

**Misc Changes:**
* Adds documentation for limiting identity-relevant labels used when evaluating Cilium Identities (Backport PR #12713, Upstream PR #12517, @seanmwinn)
* backporting: Report progress in set-labels.py (Backport PR #12713, Upstream PR #12640, @pchaigno)
* Clarify egress policy rule documentation (Backport PR #12713, Upstream PR #12525, @joestringer)
* contrib: Add ability to pass suffix for branch (Backport PR #12483, Upstream PR #12351, @christarazi)
* contrib: fix branch check in `start-backport` script (Backport PR #12483, Upstream PR #12361, @Rolinh)
* contrib: include branch name in file generated by start-backport (Backport PR #12483, Upstream PR #10649, @Rolinh)
* contrib: Print PR number in set-labels.py (Backport PR #12724, Upstream PR #12704, @christarazi)
* contrib: Tighten search for list of PRs (Backport PR #12724, Upstream PR #12703, @christarazi)
* docs(identity): Correct discrepancy between label and descriptions (Backport PR #12713, Upstream PR #12639, @sayboras)
* docs(troubleshooting): Remove bugtool related step with --serve flag (Backport PR #12713, Upstream PR #12532, @sayboras)
* docs: add instructions for vX.Y helm charts (Backport PR #12483, Upstream PR #12291, @aanm)
* test: bump k8s libraries to 1.16.12 (#12420, @aanm)
* Tidy up backporting documentation (Backport PR #12483, Upstream PR #9560, @joestringer)

**Other Changes:**
* [v1.6] k8s: Fix CRD schema version to 1.15.1 (#12498, @joestringer)
* Dockerfile: Bump v1.6 runtime image to 2020-08-03 build (#12754, @joestringer)

## v1.6.10

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.10
1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
appVersion: 1.6.10
version: 1.6.11
appVersion: 1.6.11
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.10
version: 1.6.11
condition: agent.enabled
- name: config
version: 1.6.10
version: 1.6.11
condition: config.enabled
- name: operator
version: 1.6.10
version: 1.6.11
condition: operator.enabled
- name: managed-etcd
version: 1.6.10
version: 1.6.11
condition: global.etcd.managed
- name: preflight
version: 1.6.10
version: 1.6.11
condition: preflight.enabled
- name: nodeinit
version: 1.6.10
version: 1.6.11
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.10
tag: v1.6.11

# 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.10"
image: "docker.io/cilium/cilium:v1.6.11"
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.10"
image: "docker.io/cilium/cilium:v1.6.11"
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.10"
image: "docker.io/cilium/operator:v1.6.11"
imagePullPolicy: IfNotPresent
name: cilium-operator
livenessProbe:
Expand Down

0 comments on commit 6eab0a0

Please sign in to comment.