Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v1.14] Bump envoy to v1.27.x #31007

Merged
merged 2 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/helm-values.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions images/cilium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:f384debcdc15d46ae82b8a87f

# cilium-envoy from github.com/cilium/proxy
#
FROM quay.io/cilium/cilium-envoy:v1.26.7-bbde4095997ea57ead209f56158790d47224a0f5@sha256:39b75548447978230dedcf25da8940e4d3540c741045ef391a8e74dbb9661a86 as cilium-envoy
FROM quay.io/cilium/cilium-envoy:v1.27.3-99c1c8f42c8de70fc8f6dd594f4a425cd38b6688@sha256:877ead12d08d4c04a9f67f86d3c6e542aeb7bf97e1e401aee74de456f496ac30 as cilium-envoy

#
# Hubble CLI
Expand Down Expand Up @@ -80,7 +80,7 @@ ARG TARGETARCH
LABEL maintainer="maintainer@cilium.io"
RUN echo ". /etc/profile.d/bash_completion.sh" >> /etc/bash.bashrc
COPY --from=cilium-envoy /usr/lib/libcilium.so /usr/lib/libcilium.so
COPY --from=cilium-envoy /usr/bin/cilium-envoy /usr/bin/
COPY --from=cilium-envoy /usr/bin/cilium-envoy /usr/bin/cilium-envoy-starter /usr/bin/
# When used within the Cilium container, Hubble CLI should target the
# local unix domain socket instead of Hubble Relay.
ENV HUBBLE_SERVER=unix:///var/run/cilium/hubble.sock
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
image: {{ include "cilium.image" .Values.envoy.image | quote }}
imagePullPolicy: {{ .Values.envoy.image.pullPolicy }}
command:
- /usr/bin/cilium-envoy
- /usr/bin/cilium-envoy-starter
args:
- '-c /var/run/cilium/envoy/bootstrap-config.json'
- '--base-id 0'
Expand Down
4 changes: 2 additions & 2 deletions install/kubernetes/cilium/values.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions install/kubernetes/cilium/values.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1854,9 +1854,9 @@ envoy:
image:
override: ~
repository: "quay.io/cilium/cilium-envoy"
tag: "v1.26.7-bbde4095997ea57ead209f56158790d47224a0f5"
tag: "v1.27.3-99c1c8f42c8de70fc8f6dd594f4a425cd38b6688"
pullPolicy: "${PULL_POLICY}"
digest: "sha256:39b75548447978230dedcf25da8940e4d3540c741045ef391a8e74dbb9661a86"
digest: "sha256:877ead12d08d4c04a9f67f86d3c6e542aeb7bf97e1e401aee74de456f496ac30"
useDigest: true

# -- Additional containers added to the cilium Envoy DaemonSet.
Expand Down
5 changes: 0 additions & 5 deletions pkg/envoy/ciliumenvoyconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ func ParseResources(cecNamespace string, cecName string, anySlice []cilium_v2.XD
if !found {
listener.ListenerFilters = append(listener.ListenerFilters, getListenerFilter(false /* egress */, useOriginalSourceAddr, isL7LB))
}
// Inject listener socket option for Cilium datapath
listener.SocketOptions = append(listener.SocketOptions, getListenerSocketMarkOption(false /* egress */))

// Fill in SDS & RDS config source if unset
for _, fc := range listener.FilterChains {
Expand Down Expand Up @@ -448,9 +446,6 @@ func ParseResources(cecNamespace string, cecName string, anySlice []cilium_v2.XD
resources.portAllocations = make(map[string]uint16)
}
resources.portAllocations[listener.Name] = port

// Inject Transparent to work with TPROXY
listener.Transparent = &wrapperspb.BoolValue{Value: true}
}
if validate {
if err := listener.Validate(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/envoy/embedded_envoy.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var (
)

const (
ciliumEnvoy = "cilium-envoy"
ciliumEnvoy = "cilium-envoy-starter"
)

// EnableTracing changes Envoy log level to "trace", producing the most logs.
Expand Down
19 changes: 0 additions & 19 deletions pkg/envoy/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
envoy_type_matcher "github.com/cilium/proxy/go/envoy/type/matcher/v3"
"github.com/cilium/proxy/pkg/policy/api/kafka"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb"
Expand Down Expand Up @@ -782,20 +781,6 @@ func getListenerFilter(isIngress bool, useOriginalSourceAddr bool, l7lb bool) *e
}
}

func getListenerSocketMarkOption(isIngress bool) *envoy_config_core.SocketOption {
socketMark := int64(0xB00)
if isIngress {
socketMark = 0xA00
}
return &envoy_config_core.SocketOption{
Description: "Listener socket mark",
Level: unix.SOL_SOCKET,
Name: unix.SO_MARK,
Value: &envoy_config_core.SocketOption_IntValue{IntValue: socketMark},
State: envoy_config_core.SocketOption_STATE_PREBIND,
}
}

func (s *XDSServer) getListenerConf(name string, kind policy.L7ParserType, port uint16, isIngress bool, mayUseOriginalSourceAddr bool) *envoy_config_listener.Listener {
clusterName := egressClusterName
tlsClusterName := egressTLSClusterName
Expand All @@ -810,10 +795,6 @@ func (s *XDSServer) getListenerConf(name string, kind policy.L7ParserType, port
Name: name,
Address: addr,
AdditionalAddresses: additionalAddr,
Transparent: &wrapperspb.BoolValue{Value: true},
SocketOptions: []*envoy_config_core.SocketOption{
getListenerSocketMarkOption(isIngress),
},
// FilterChains: []*envoy_config_listener.FilterChain
ListenerFilters: []*envoy_config_listener.ListenerFilter{
// Always insert tls_inspector as the first filter
Expand Down