Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
843aa5d
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Mar 22, 2025
fd8e13f
Release 1.24 fix test services reachability and flackiness (#55642)
MaxBab Mar 24, 2025
e62d26a
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Mar 25, 2025
7568e60
Update BASE_VERSION to 1.24-2025-03-25T19-01-20 (#55671)
istio-testing Mar 25, 2025
2b9930c
[release-1.24] - Fix TestCNIRaceRepair test for Openshift (#55658)
MaxBab Mar 26, 2025
acf1252
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Mar 26, 2025
2019a2a
Manual 1.24 backport of #55304 (#55396)
bleggett Mar 27, 2025
0a29393
[release-1.24] disable inbound retry policy for gRPC streaming (#55689)
istio-testing Mar 27, 2025
9c5c422
Fix broken IstioCNI config for enabling repair mode (#55703)
istio-testing Mar 27, 2025
373b15a
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Mar 27, 2025
96e6927
Update BASE_VERSION to 1.24-2025-04-04T19-02-09 (#55809)
istio-testing Apr 4, 2025
af138eb
pilot: fix bug in Alias type RDS cache (#55814)
istio-testing Apr 7, 2025
d430b91
Fix tests resources cleanup for Openshift (#55638)
MaxBab Apr 8, 2025
0dd5659
Do not split root CA, fixing 1.25.1 regression (#55850)
istio-testing Apr 9, 2025
3ad5dca
Automator: update common-files@release-1.24 in istio/istio@release-1.…
istio-testing Apr 9, 2025
7112d94
Automator: update istio/client-go@release-1.24 dependency in istio/is…
istio-testing Apr 9, 2025
43fcc77
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Apr 9, 2025
a612e50
Automator: update ztunnel@release-1.24 in istio/istio@release-1.24 (#…
istio-testing Apr 10, 2025
8348c27
Automator: update proxy@release-1.24 in istio/istio@release-1.24 (#55…
istio-testing Apr 11, 2025
f750bd1
Merge tag '1.24.5' into sync-upstream-1.24.5
FilipB May 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "istio build-tools",
"image": "gcr.io/istio-testing/build-tools:release-1.24-7d1c19cf1d83ca3cfdb7cc7b90dd807fe41653da",
"image": "gcr.io/istio-testing/build-tools:release-1.24-bccd228953b7abf90170da1419699d38e95329fb",
"privileged": true,
"remoteEnv": {
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ var/
.DS_Store
/manifests/charts/**/charts/
/manifests/charts/**/Chart.lock
/cni/pkg/plugin/istio-cni.log
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif
export VERSION

# Base version of Istio image to use
BASE_VERSION ?= 1.24-2025-03-04T19-01-29
BASE_VERSION ?= 1.24-2025-04-04T19-02-09
ISTIO_BASE_REGISTRY ?= gcr.io/istio-release

export GO111MODULE ?= on
Expand Down
1 change: 1 addition & 0 deletions cni/pkg/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ func constructConfig() (*config.Config, error) {
MonitoringPort: viper.GetInt(constants.MonitoringPort),

ExcludeNamespaces: viper.GetString(constants.ExcludeNamespaces),
PodNamespace: viper.GetString(constants.PodNamespace),
ZtunnelUDSAddress: viper.GetString(constants.ZtunnelUDSAddress),

AmbientEnabled: viper.GetBool(constants.AmbientEnabled),
Expand Down
4 changes: 4 additions & 0 deletions cni/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ type InstallConfig struct {
// Comma-separated list of K8S namespaces that CNI should ignore
ExcludeNamespaces string

// Singular namespace that the istio CNI node agent resides in
PodNamespace string

// KUBERNETES_SERVICE_PROTOCOL
K8sServiceProtocol string
// KUBERNETES_SERVICE_HOST
Expand Down Expand Up @@ -130,6 +133,7 @@ func (c InstallConfig) String() string {
b.WriteString("SkipTLSVerify: " + fmt.Sprint(c.SkipTLSVerify) + "\n")

b.WriteString("ExcludeNamespaces: " + fmt.Sprint(c.ExcludeNamespaces) + "\n")
b.WriteString("PodNamespace: " + fmt.Sprint(c.PodNamespace) + "\n")
b.WriteString("K8sServiceProtocol: " + c.K8sServiceProtocol + "\n")
b.WriteString("K8sServiceHost: " + c.K8sServiceHost + "\n")
b.WriteString("K8sServicePort: " + fmt.Sprint(c.K8sServicePort) + "\n")
Expand Down
3 changes: 3 additions & 0 deletions cni/pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const (
CNIEventSocket = "cni-event-address"
CNIAgentRunDir = "cni-agent-run-dir"
ExcludeNamespaces = "exclude-namespaces"
PodNamespace = "pod-namespace"
AmbientEnabled = "ambient-enabled"
AmbientDNSCapture = "ambient-dns-capture"
AmbientIPv6 = "ambient-ipv6"
Expand Down Expand Up @@ -62,6 +63,8 @@ const (
UDSLogPath = "/log"
CNIEventSocketName = "pluginevent.sock"
LogUDSSocketName = "log.sock"
LocalRollingLogName = "istio-cni.log"
RollingLogMaxSizeMB = 10
CNIPluginKubeconfName = "istio-cni-kubeconfig"
// K8s liveness and readiness endpoints
LivenessEndpoint = "/healthz"
Expand Down
1 change: 1 addition & 0 deletions cni/pkg/install/cniconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func createCNIConfigFile(ctx context.Context, cfg *config.InstallConfig) (string
CNIAgentRunDir: cfg.CNIAgentRunDir,
AmbientEnabled: cfg.AmbientEnabled,
ExcludeNamespaces: strings.Split(cfg.ExcludeNamespaces, ","),
PodNamespace: cfg.PodNamespace,
}

pluginConfig.Name = "istio-cni"
Expand Down
3 changes: 3 additions & 0 deletions cni/pkg/install/cniconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ const (
"name": "istio-cni",
"type": "istio-cni",
"plugin_log_level": "__LOG_LEVEL__",
"pod_namespace": "__POD_NAMESPACE__",
"kubernetes": {
"kubeconfig": "__KUBECONFIG_FILENAME__",
"cni_bin_dir": "/path/cni/bin"
Expand Down Expand Up @@ -451,13 +452,15 @@ func TestCreateCNIConfigFile(t *testing.T) {
ChainedCNIPlugin: c.chainedCNIPlugin,
PluginLogLevel: "debug",
CNIAgentRunDir: kubeconfigFilename,
PodNamespace: "my-namespace",
}

cfg := config.InstallConfig{
CNIConfName: c.specifiedConfName,
ChainedCNIPlugin: c.chainedCNIPlugin,
PluginLogLevel: "debug",
CNIAgentRunDir: kubeconfigFilename,
PodNamespace: "my-namespace",
}
test := func(cfg config.InstallConfig) func(t *testing.T) {
return func(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions cni/pkg/install/testdata/bridge.conf.golden
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"ipam": {},
"name": "istio-cni",
"plugin_log_level": "debug",
"pod_namespace": "my-namespace",
"type": "istio-cni"
}
]
Expand Down
3 changes: 2 additions & 1 deletion cni/pkg/install/testdata/istio-cni.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"ambient_enabled": false,
"exclude_namespaces": [
""
]
],
"pod_namespace": "my-namespace"
}
1 change: 1 addition & 0 deletions cni/pkg/install/testdata/list-with-istio.conflist.golden
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"ipam": {},
"name": "istio-cni",
"plugin_log_level": "debug",
"pod_namespace": "my-namespace",
"type": "istio-cni"
}
]
Expand Down
1 change: 1 addition & 0 deletions cni/pkg/install/testdata/list.conflist.golden
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"ipam": {},
"name": "istio-cni",
"plugin_log_level": "debug",
"pod_namespace": "my-namespace",
"type": "istio-cni"
}
]
Expand Down
41 changes: 39 additions & 2 deletions cni/pkg/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"path/filepath"
"runtime/debug"
"strconv"
"strings"
"time"

"github.com/containernetworking/cni/pkg/skel"
Expand Down Expand Up @@ -66,6 +67,7 @@ type Config struct {
CNIAgentRunDir string `json:"cni_agent_run_dir"`
AmbientEnabled bool `json:"ambient_enabled"`
ExcludeNamespaces []string `json:"exclude_namespaces"`
PodNamespace string `json:"pod_namespace"`
}

// K8sArgs is the valid CNI_ARGS used for Kubernetes
Expand Down Expand Up @@ -109,6 +111,8 @@ func parseConfig(stdin []byte) (*Config, error) {
return &conf, nil
}

// Logging with CNI plugins is special - we *cannot* log to stdout, as the CNI spec uses stdin/stdout to pass context between invoked plugins.
// So, we log to a rolling logfile, and also forward logs via UDS to the node agent (if available)
func GetLoggingOptions(cfg *Config) *log.Options {
loggingOptions := log.DefaultOptions()
loggingOptions.OutputPaths = []string{"stderr"}
Expand All @@ -120,6 +124,10 @@ func GetLoggingOptions(cfg *Config) *log.Options {
if file.Exists(udsAddr) {
loggingOptions.WithTeeToUDS(udsAddr, constants.UDSLogPath)
}

// Also tee to a rolling log on the node's local filesystem, in case the UDS server is down.
loggingOptions.WithTeeToRollingLocal(filepath.Join(cfg.CNIAgentRunDir, constants.LocalRollingLogName), constants.RollingLogMaxSizeMB)

// Override plugin log level based on their config. Not we use "all" (OverrideScopeName) since there is no scoping in the plugin.
if cfg.PluginLogLevel != "" {
loggingOptions.SetDefaultOutputLevel(log.OverrideScopeName, log.StringToLevel(cfg.PluginLogLevel))
Expand Down Expand Up @@ -222,15 +230,18 @@ func doAddRun(args *skel.CmdArgs, conf *Config, kClient kubernetes.Interface, ru
cniEventAddr := filepath.Join(conf.CNIAgentRunDir, constants.CNIEventSocketName)
cniClient := newCNIClient(cniEventAddr, constants.CNIAddEventPath)
if err = PushCNIEvent(cniClient, args, prevResIps, podName, podNamespace); err != nil {
log.Errorf("istio-cni cmdAdd failed to signal node Istio CNI agent: %s", err)
return err
// return a more informative error in the pod event log if CNI plugin fails
wrapErr := fmt.Errorf("istio-cni cmdAdd failed to contact node Istio CNI agent: %s", err)
return wrapErr
}
return nil
}
log.Debugf("istio-cni ambient cmdAdd podName: %s - not ambient enabled, ignoring", podName)
}
// End ambient plugin logic

maybeCNIPod := string(k8sArgs.K8S_POD_NAME)
maybeCNINS := string(k8sArgs.K8S_POD_NAMESPACE)
pi := &PodInfo{}
var k8sErr error
for attempt := 1; attempt <= podRetrievalMaxRetries; attempt++ {
Expand All @@ -239,6 +250,32 @@ func doAddRun(args *skel.CmdArgs, conf *Config, kClient kubernetes.Interface, ru
break
}
log.Debugf("Failed to get %s/%s pod info: %v", podNamespace, podName, k8sErr)

// Failsafe - if we get here, we could be in a state where
// 1. We are being upgraded - `istio-cni` node agent pod is gone
// 2. This plugin was left in place to stall pod spawns until the
// replacement arrives.
// 3. This plugin can't contact the K8S API server (creds expired/invalid)
// 4. The pod this plugin would be blocking by returning this error
// *is* our replacement `istio-cni` pod (which would refresh our creds)
//
// So, if we can't contact the K8S API server at all, fall back to checking the
// K8S_POD/K8S_NAMESPACE values from the CNI layer, and let this pod through
// if it looks like it might be our `istio-cni` node agent.
//
// We could do this check unconditionally above, but it seems smarter to only
// fall back to this (lightly) relaxed check when we know we are in a degraded state.
//
// Is this fail open? Not really, the K8S args come from the cluster's CNI and are as-authoritative
// as the hard query we would otherwise make against the API.
//
// TODO NRI could probably give us more identifying information here OOB from k8s.
if strings.HasPrefix(maybeCNIPod, "istio-cni-node-") &&
maybeCNINS == conf.PodNamespace {
log.Infof("in a degraded state and %v looks like our own agent pod, skipping", maybeCNIPod)
return nil
}

time.Sleep(podRetrievalInterval)
}
if k8sErr != nil {
Expand Down
1 change: 1 addition & 0 deletions cni/test/testdata/expected/10-calico.conflist-istioconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"ipam": {},
"name": "istio-cni",
"plugin_log_level": "debug",
"pod_namespace": "",
"type": "istio-cni"
}
]
Expand Down
3 changes: 2 additions & 1 deletion cni/test/testdata/expected/YYY-istio-cni.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
"ambient_enabled": false,
"exclude_namespaces": [
"istio-system"
]
],
"pod_namespace": ""
}
1 change: 1 addition & 0 deletions cni/test/testdata/expected/minikube_cni.conflist.expected
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"ipam": {},
"name": "istio-cni",
"plugin_log_level": "debug",
"pod_namespace": "",
"type": "istio-cni"
}
]
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6d1ea5c54f7aad9c31e8ff058772f9f44cbe08e0
2a57949e8949678850564daef685829ceb137ed5
2 changes: 1 addition & 1 deletion common/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fi
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
PROJECT_ID=${PROJECT_ID:-istio-testing}
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=release-1.24-7d1c19cf1d83ca3cfdb7cc7b90dd807fe41653da
IMAGE_VERSION=release-1.24-bccd228953b7abf90170da1419699d38e95329fb
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
Expand Down
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.34.2
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.16.1
istio.io/api v1.24.4-0.20250310185707-46b0c1b3e4e4
istio.io/client-go v1.24.4-0.20250310190306-37b46c6daa9d
istio.io/api v1.24.5-0.20250409200717-4933c1da972e
istio.io/client-go v1.24.5-0.20250409201417-1715c4db04bc
k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery v0.31.1
Expand Down
10 changes: 6 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
Expand All @@ -612,10 +614,10 @@ helm.sh/helm/v3 v3.16.1 h1:cER6tI/8PgUAsaJaQCVBUg3VI9KN4oVaZJgY60RIc0c=
helm.sh/helm/v3 v3.16.1/go.mod h1:r+xBHHP20qJeEqtvBXMf7W35QDJnzY/eiEBzt+TfHps=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
istio.io/api v1.24.4-0.20250310185707-46b0c1b3e4e4 h1:0ZgJiQUNTGbgGQtJ9sfWctqDbMaLutruYXtkAl9gLQI=
istio.io/api v1.24.4-0.20250310185707-46b0c1b3e4e4/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
istio.io/client-go v1.24.4-0.20250310190306-37b46c6daa9d h1:ZQ4yFn1BwC4id6WXl6oTtKgFO47wcOFe8OBaLJBMII4=
istio.io/client-go v1.24.4-0.20250310190306-37b46c6daa9d/go.mod h1:LTWLnhwfH/AZGJtdlzpWy4YdTAv7E0qGKtECN0c4aeM=
istio.io/api v1.24.5-0.20250409200717-4933c1da972e h1:5LzLnhNQtSAfK/rsW5h+hlJtUM0LCFJwQwqwtR3UiD4=
istio.io/api v1.24.5-0.20250409200717-4933c1da972e/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I=
istio.io/client-go v1.24.5-0.20250409201417-1715c4db04bc h1:9GZ8yyhY6Q5ozjMO51yt3eAgor+uoEDsVUVfGmAfP1M=
istio.io/client-go v1.24.5-0.20250409201417-1715c4db04bc/go.mod h1:2Gx1QpUyGeB58ndq28yHcWV4fIHeO8F5T+ox2sPT2+E=
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
Expand Down
4 changes: 2 additions & 2 deletions istio.deps
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"name": "PROXY_REPO_SHA",
"repoName": "proxy",
"file": "",
"lastStableSHA": "5b5a94eac1658c67702f8116c496695cc723136f"
"lastStableSHA": "e06e0d0c05e0cc4339c7f3a93faff6eeaad12a2e"
},
{
"_comment": "",
"name": "ZTUNNEL_REPO_SHA",
"repoName": "ztunnel",
"file": "",
"lastStableSHA": "9d2fe78f022f4616e43feb006f077310ef21b932"
"lastStableSHA": "70c638ecb14a7b4e161af6a3d275f774e87630ef"
}
]
1 change: 1 addition & 0 deletions istioctl/pkg/writer/ztunnel/configdump/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ type CertsDump struct {
Identity string `json:"identity"`
State string `json:"state"`
CertChain []*Cert `json:"certChain"`
RootCert []*Cert `json:"rootCerts"`
}

type Cert struct {
Expand Down
10 changes: 9 additions & 1 deletion istioctl/pkg/writer/ztunnel/configdump/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,26 @@ func (c *ConfigWriter) PrintSecretSummary() error {
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
secret.Identity, valueOrNA(""), secret.State, false, valueOrNA(""), valueOrNA(""), valueOrNA(""))
} else {
// Before, the root was part of the certChain.
legacyFormat := len(secret.RootCert) == 0
for i, ca := range secret.CertChain {
t := "Intermediate"
if i == 0 {
t = "Leaf"
} else if i == len(secret.CertChain)-1 {
} else if i == len(secret.CertChain)-1 && legacyFormat {
t = "Root"
}
n := new(big.Int)
n, _ = n.SetString(ca.SerialNumber, 10)
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%x\t%v\t%v\n",
secret.Identity, t, secret.State, certNotExpired(ca), n, valueOrNA(ca.ExpirationTime), valueOrNA(ca.ValidFrom))
}
for _, ca := range secret.RootCert {
n := new(big.Int)
n, _ = n.SetString(ca.SerialNumber, 10)
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%x\t%v\t%v\n",
secret.Identity, "Root", secret.State, certNotExpired(ca), n, valueOrNA(ca.ExpirationTime), valueOrNA(ca.ValidFrom))
}
}
}
return w.Flush()
Expand Down
21 changes: 21 additions & 0 deletions licenses/gopkg.in/natefinch/lumberjack.v2/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Nate Finch

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 2 additions & 2 deletions manifests/charts/istio-cni/templates/configmap-cni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ data:
CNI_CONF_NAME: {{ .Values.cniConfFileName }} # Name of the CNI config file to create. Only override if you know the exact path your CNI requires..
{{- end }}
CHAINED_CNI_PLUGIN: {{ .Values.chained | quote }}
EXCLUDED_NAMESPACES: "{{ range $idx, $ns := .Values.excludeNamespaces }}{{ if $idx }},{{ end }}{{ $ns }}{{ end }}"
REPAIR_ENABLED: {{ .Values.chained | quote }}
EXCLUDE_NAMESPACES: "{{ range $idx, $ns := .Values.excludeNamespaces }}{{ if $idx }},{{ end }}{{ $ns }}{{ end }}"
REPAIR_ENABLED: {{ .Values.repair.enabled | quote }}
REPAIR_LABEL_PODS: {{ .Values.repair.labelPods | quote }}
REPAIR_DELETE_PODS: {{ .Values.repair.deletePods | quote }}
REPAIR_REPAIR_PODS: {{ .Values.repair.repairPods | quote }}
Expand Down
4 changes: 4 additions & 0 deletions manifests/charts/istio-cni/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
kind: DaemonSet
apiVersion: apps/v1
metadata:
# Note that this is templated but evaluates to a fixed name
# which the CNI plugin may fall back onto in some failsafe scenarios.
# if this name is changed, CNI plugin logic that checks for this name
# format should also be updated.
name: {{ template "name" . }}-node
namespace: {{ .Release.Namespace }}
labels:
Expand Down
2 changes: 1 addition & 1 deletion pilot/pkg/networking/core/httproute.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (configgen *ConfigGeneratorImpl) BuildHTTPRoutes(
// TODO: trace decorators, inbound timeouts
func buildSidecarInboundHTTPRouteConfig(lb *ListenerBuilder, cc inboundChainConfig) *route.RouteConfiguration {
traceOperation := telemetry.TraceOperation(string(cc.telemetryMetadata.InstanceHostname), cc.port.Port)
defaultRoute := istio_route.BuildDefaultHTTPInboundRoute(lb.node, cc.clusterName, traceOperation)
defaultRoute := istio_route.BuildDefaultHTTPInboundRoute(lb.node, cc.clusterName, traceOperation, cc.port.Protocol)

inboundVHost := &route.VirtualHost{
Name: inboundVirtualHostPrefix + strconv.Itoa(cc.port.Port), // Format: "inbound|http|%d"
Expand Down
Loading