Skip to content

Attempt to fix merging latest api/client-go repos[WIP] #40479

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

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Attempt to fix merging latest api/client-go repos[WIP] #40479

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ require (
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.9.0
istio.io/api v0.0.0-20220811073502-ef38878bf5f0
istio.io/client-go v1.12.0-alpha.5.0.20220808181119-e13c0270f465
istio.io/api v0.0.0-20220812165511-84e2baba34eb
istio.io/client-go v1.12.0-alpha.5.0.20220812165912-faa59fdcfe39
istio.io/pkg v0.0.0-20220804202146-4787664020d6
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,10 +2433,10 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
istio.io/api v0.0.0-20220811073502-ef38878bf5f0 h1:HAp2EgvbyAaoSTudC5A+Gst8uXtvfwwGI+xdLudU5CE=
istio.io/api v0.0.0-20220811073502-ef38878bf5f0/go.mod h1:hQkF0Q19MCmfOTre/Sg4KvrwwETq45oaFplnBm2p4j8=
istio.io/client-go v1.12.0-alpha.5.0.20220808181119-e13c0270f465 h1:wgG5HomMWzH160sfS4CGQVw6c2l+boYHH2NexgYgX50=
istio.io/client-go v1.12.0-alpha.5.0.20220808181119-e13c0270f465/go.mod h1:bsxPnPkFF405Kw1Iz67GsL0QIIJhuc67WN63bAa9FSU=
istio.io/api v0.0.0-20220812165511-84e2baba34eb h1:ihIA794arMSJmyPboNLculK93SonNCmz8to97LU4NRs=
istio.io/api v0.0.0-20220812165511-84e2baba34eb/go.mod h1:hQkF0Q19MCmfOTre/Sg4KvrwwETq45oaFplnBm2p4j8=
istio.io/client-go v1.12.0-alpha.5.0.20220812165912-faa59fdcfe39 h1:8qEBDMfHJdvoYoMbMriNUHrBEkk8ens6jjRuRolba3Q=
istio.io/client-go v1.12.0-alpha.5.0.20220812165912-faa59fdcfe39/go.mod h1:LapJh4IbfAtU/zqQVSMxXHNYInBoemCSahss2wh0TOU=
istio.io/pkg v0.0.0-20220804202146-4787664020d6 h1:ah77khK9ID4J/oRQ0HSdK659HSsjbpB76VggLXJtYnE=
istio.io/pkg v0.0.0-20220804202146-4787664020d6/go.mod h1:kcBYN5TiyGFM2bs4b7K81j+YeDZ4JrINP+brV9ehZe0=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
Expand Down
1 change: 1 addition & 0 deletions operator/pkg/util/merge_iop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ type (
Skywalking struct{} `json:"skywalking"`
EnvoyHTTPAls struct{} `json:"envoyHttpAls"`
EnvoyTCPAls struct{} `json:"envoyTcpAls"`
OpenTelemetry struct{} `json:"opentelemetry"`
}
clusterName struct {
ServiceCluster *v1alpha13.ProxyConfig_ServiceCluster `json:"serviceCluster,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions operator/pkg/util/merge_iop_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ func TestOverlayIOPExhaustiveness(t *testing.T) {
"skywalking": {},
"envoy_http_als": {},
"envoy_tcp_als": {},
"opentelemetry": {},
}

unexpectedProviders := make([]string, 0)
Expand Down
2 changes: 2 additions & 0 deletions operator/pkg/util/testdata/overlay-iop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ spec:
envoyHttpAls:
- name: envoyTcpAls
envoyTcpAls:
- name: opentelemetry
opentelemetry:
components:
egressGateways:
- name: istio-egressgateway
Expand Down
1 change: 1 addition & 0 deletions pilot/pkg/model/push_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,6 +2382,7 @@ func TestGetHostsFromMeshConfigExhaustiveness(t *testing.T) {
"envoy_http_als": {},
"envoy_tcp_als": {},
"envoy_otel_als": {},
"opentelemetry": {},
}

unexpectedProviders := make([]string, 0)
Expand Down