Skip to content

Commit

Permalink
Prepare for release v1.2.3
Browse files Browse the repository at this point in the history
Signed-off by: Ian Vernon <ian@cilium.io>
  • Loading branch information
Ian Vernon authored and tgraf committed Sep 18, 2018
1 parent 75cb267 commit 4a41ef3
Show file tree
Hide file tree
Showing 30 changed files with 125 additions and 33 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Amey Bhide amey@covalent.io
Amre Shakimov amre@covalent.io
André Martins andre@cilium.io
andrewsykim kim.andrewsy@gmail.com
Anit Gandhi anitgandhi@gmail.com
Arvind Soni arvindsoni@gmail.com
Ashwin Paranjpe ashwin@covalent.io
ChristopherBiscardi chris@christopherbiscardi.com
Expand Down
37 changes: 37 additions & 0 deletions NEWS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,43 @@
NEWS
******

1.2.3
=====

::

André Martins (8):
fix alignment in Go structs
pkg/identity: fix log warning to be correctly formatted
pkg/identity: return user fixed identities with cilium identity list
pkg/identity: return identities ordered by ID
etcd-operator: update k8s descriptor with cilium 1.2.2
etcd-operator: update k8s developer descriptor
pkg/k8s: allow namespace specification in FromEndpoints without k8s source
dep: avoid dep panic for fsnotify repository

Eloy Coto (2):
Test: Using locks on read/write operations
Test/Demos: Make assert more robust.

Ian Vernon (2):
endpoint: remove revision check around L4 policy calculation
test: add CI test for endpoint with already-allocated identity

Joe Stringer (5):
examples/kubernetes: Add clean-cilium-bpf-state option
docs: Document safe downgrade to Cilium 1.0.
bpf: Monitor DNS with MTU-sized payload len
bpf: Rework monitor tracing to specify capture len
daemon: Define MTU in node_config.h

Romain Lenglet (1):
proxy: Check whether a port is already open before allocating

Thomas Graf (2):
k8s: Include type of derived k8s resource in policy rule
k8s: Fix CNP delete handling to not rely on rules being embedded

1.2.2
=====

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.2
1.2.3
4 changes: 2 additions & 2 deletions examples/getting-started/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

Vagrant.require_version ">= 2.0.0"

cilium_version = (ENV['CILIUM_VERSION'] || "v1.2.2")
cilium_version = (ENV['CILIUM_VERSION'] || "v1.2.3")
cilium_opts = (ENV['CILIUM_OPTS'] || "--kvstore consul --kvstore-opt consul.address 192.168.33.11:8500 -t vxlan")
cilium_tag = (ENV['CILIUM_TAG'] || "v1.2.2")
cilium_tag = (ENV['CILIUM_TAG'] || "v1.2.3")

# This runs only once when vagrant box is provisioned for the first time
$bootstrap = <<SCRIPT
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.10/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.10/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.10/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.10/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.11/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.11/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.11/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.11/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.12/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.12/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.12/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.12/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
16 changes: 15 additions & 1 deletion examples/kubernetes/1.7/cilium-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,22 @@ data:
# If you want to run cilium in debug mode change this value to true
debug: "false"
disable-ipv4: "false"
# If you want to clean cilium state; change this value to true

# If a serious issue occurs during Cilium startup, this
# invasive option may be set to true to remove all persistent
# state. Endpoints will not be restored using knowledge from a
# prior Cilium run, so they may receive new IP addresses upon
# restart. This also triggers clean-cilium-bpf-state.
clean-cilium-state: "false"
# If you want to clean cilium BPF state, set this to true;
# Removes all BPF maps from the filesystem. Upon restart,
# endpoints are restored with the same IP addresses, however
# any ongoing connections may be disrupted briefly.
# Loadbalancing decisions will be reset, so any ongoing
# connections via a service may be loadbalanced to a different
# backend after restart.
clean-cilium-bpf-state: "false"

legacy-host-allows-world: "false"

# If you want cilium monitor to aggregate tracing for packets, set this level
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.7/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
18 changes: 16 additions & 2 deletions examples/kubernetes/1.7/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,22 @@ data:
# If you want to run cilium in debug mode change this value to true
debug: "false"
disable-ipv4: "false"
# If you want to clean cilium state; change this value to true

# If a serious issue occurs during Cilium startup, this
# invasive option may be set to true to remove all persistent
# state. Endpoints will not be restored using knowledge from a
# prior Cilium run, so they may receive new IP addresses upon
# restart. This also triggers clean-cilium-bpf-state.
clean-cilium-state: "false"
# If you want to clean cilium BPF state, set this to true;
# Removes all BPF maps from the filesystem. Upon restart,
# endpoints are restored with the same IP addresses, however
# any ongoing connections may be disrupted briefly.
# Loadbalancing decisions will be reset, so any ongoing
# connections via a service may be loadbalanced to a different
# backend after restart.
clean-cilium-bpf-state: "false"

legacy-host-allows-world: "false"

# If you want cilium monitor to aggregate tracing for packets, set this level
Expand Down Expand Up @@ -108,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
10 changes: 8 additions & 2 deletions examples/kubernetes/1.7/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- name: clean-cilium-state
image: docker.io/library/busybox:1.28.4
imagePullPolicy: IfNotPresent
command: ['sh', '-c', 'if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then rm -rf /var/run/cilium/state; rm -rf /sys/fs/bpf/tc/globals/cilium_*; fi']
command: ['sh', '-c', 'if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then rm -rf /var/run/cilium/state; fi; if [ "${CLEAN_CILIUM_STATE}" = "true" ] || [ "${CLEAN_CILIUM_BPF_STATE}" = "true" ]; then rm -rf /sys/fs/bpf/tc/globals/cilium_* /var/run/cilium/bpffs/tc/globals/cilium_*; fi']
securityContext:
capabilities:
add:
Expand All @@ -53,8 +53,14 @@ spec:
name: cilium-config
optional: true
key: clean-cilium-state
- name: "CLEAN_CILIUM_BPF_STATE"
valueFrom:
configMapKeyRef:
name: cilium-config
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
26 changes: 23 additions & 3 deletions examples/kubernetes/1.7/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,22 @@ data:
# If you want to run cilium in debug mode change this value to true
debug: "false"
disable-ipv4: "false"
# If you want to clean cilium state; change this value to true

# If a serious issue occurs during Cilium startup, this
# invasive option may be set to true to remove all persistent
# state. Endpoints will not be restored using knowledge from a
# prior Cilium run, so they may receive new IP addresses upon
# restart. This also triggers clean-cilium-bpf-state.
clean-cilium-state: "false"
# If you want to clean cilium BPF state, set this to true;
# Removes all BPF maps from the filesystem. Upon restart,
# endpoints are restored with the same IP addresses, however
# any ongoing connections may be disrupted briefly.
# Loadbalancing decisions will be reset, so any ongoing
# connections via a service may be loadbalanced to a different
# backend after restart.
clean-cilium-bpf-state: "false"

legacy-host-allows-world: "false"

# If you want cilium monitor to aggregate tracing for packets, set this level
Expand Down Expand Up @@ -89,7 +103,7 @@ spec:
- name: clean-cilium-state
image: docker.io/library/busybox:1.28.4
imagePullPolicy: IfNotPresent
command: ['sh', '-c', 'if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then rm -rf /var/run/cilium/state; rm -rf /sys/fs/bpf/tc/globals/cilium_*; fi']
command: ['sh', '-c', 'if [ "${CLEAN_CILIUM_STATE}" = "true" ]; then rm -rf /var/run/cilium/state; fi; if [ "${CLEAN_CILIUM_STATE}" = "true" ] || [ "${CLEAN_CILIUM_BPF_STATE}" = "true" ]; then rm -rf /sys/fs/bpf/tc/globals/cilium_* /var/run/cilium/bpffs/tc/globals/cilium_*; fi']
securityContext:
capabilities:
add:
Expand All @@ -107,8 +121,14 @@ spec:
name: cilium-config
optional: true
key: clean-cilium-state
- name: "CLEAN_CILIUM_BPF_STATE"
valueFrom:
configMapKeyRef:
name: cilium-config
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.8/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.8/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.8/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.8/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.9/cilium-crio-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.9/cilium-crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
optional: true
key: clean-cilium-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.9/cilium-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes/1.9/cilium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
optional: true
key: clean-cilium-bpf-state
containers:
- image: docker.io/cilium/cilium:v1.2.2
- image: docker.io/cilium/cilium:v1.2.3
imagePullPolicy: IfNotPresent
name: cilium-agent
command: ["cilium-agent"]
Expand Down

0 comments on commit 4a41ef3

Please sign in to comment.