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.

Sign up for GitHub

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

Update master to release 1.20 #46345

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Update master to release 1.20 #46345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19
1.20
12 changes: 6 additions & 6 deletions istioctl/pkg/writer/pilot/status_test.go
View file
Original file line number Diff line number Diff line change
@@ -273,7 +273,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy1",
clusterID: "cluster1",
version: "1.19",
version: "1.20",
cdsSyncStatus: status.ConfigStatus_STALE,
ldsSyncStatus: status.ConfigStatus_SYNCED,
rdsSyncStatus: status.ConfigStatus_NOT_SENT,
@@ -285,7 +285,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy2",
clusterID: "cluster2",
version: "1.18",
version: "1.19",
cdsSyncStatus: status.ConfigStatus_STALE,
ldsSyncStatus: status.ConfigStatus_SYNCED,
rdsSyncStatus: status.ConfigStatus_SYNCED,
@@ -297,7 +297,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy3",
clusterID: "cluster3",
version: "1.19",
version: "1.20",
cdsSyncStatus: status.ConfigStatus_NOT_SENT,
ldsSyncStatus: status.ConfigStatus_ERROR,
rdsSyncStatus: status.ConfigStatus_NOT_SENT,
@@ -309,7 +309,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy4",
clusterID: "cluster4",
version: "1.19",
version: "1.20",
cdsSyncStatus: status.ConfigStatus_UNKNOWN,
ldsSyncStatus: status.ConfigStatus_UNKNOWN,
rdsSyncStatus: status.ConfigStatus_UNKNOWN,
@@ -327,7 +327,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy1",
clusterID: "cluster1",
version: "1.19",
version: "1.20",
cdsSyncStatus: status.ConfigStatus_STALE,
ldsSyncStatus: status.ConfigStatus_SYNCED,
rdsSyncStatus: status.ConfigStatus_NOT_SENT,
@@ -337,7 +337,7 @@ func TestXdsStatusWriter_PrintAll(t *testing.T) {
{
proxyID: "proxy2",
clusterID: "cluster2",
version: "1.19",
version: "1.20",
cdsSyncStatus: status.ConfigStatus_STALE,
ldsSyncStatus: status.ConfigStatus_SYNCED,
rdsSyncStatus: status.ConfigStatus_SYNCED,
8 changes: 4 additions & 4 deletions istioctl/pkg/writer/pilot/testdata/multiXdsStatusMultiPilot.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME CLUSTER CDS LDS EDS RDS ECDS ISTIOD VERSION
proxy1 cluster1 STALE SYNCED SYNCED NOT_SENT SYNCED istiod1 1.19
proxy2 cluster2 STALE SYNCED STALE SYNCED STALE istiod2 1.18
proxy3 cluster3 NOT_SENT ERROR STALE NOT_SENT NOT_SENT istiod3 1.19
proxy4 cluster4 IGNORED IGNORED IGNORED IGNORED IGNORED istiod4 1.19
proxy1 cluster1 STALE SYNCED SYNCED NOT_SENT SYNCED istiod1 1.20
proxy2 cluster2 STALE SYNCED STALE SYNCED STALE istiod2 1.19
proxy3 cluster3 NOT_SENT ERROR STALE NOT_SENT NOT_SENT istiod3 1.20
proxy4 cluster4 IGNORED IGNORED IGNORED IGNORED IGNORED istiod4 1.20
4 changes: 2 additions & 2 deletions istioctl/pkg/writer/pilot/testdata/multiXdsStatusSinglePilot.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NAME CLUSTER CDS LDS EDS RDS ECDS ISTIOD VERSION
proxy1 cluster1 STALE SYNCED SYNCED NOT_SENT NOT_SENT istiod1 1.19
proxy2 cluster2 STALE SYNCED STALE SYNCED NOT_SENT istiod1 1.19
proxy1 cluster1 STALE SYNCED SYNCED NOT_SENT NOT_SENT istiod1 1.20
proxy2 cluster2 STALE SYNCED STALE SYNCED NOT_SENT istiod1 1.20
2 changes: 1 addition & 1 deletion istioctl/pkg/writer/ztunnel/configdump/testdata/dump.json
View file
Original file line number Diff line number Diff line change
@@ -580,7 +580,7 @@
"nanos": 0
},
"proxy_metadata": {
"ISTIO_VERSION": "1.19-dev"
"ISTIO_VERSION": "1.20-dev"
},
"num_worker_threads": 2,
"enable_original_source": null,
Loading