diff --git a/Gopkg.lock b/Gopkg.lock index c54da45df..ac99de001 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -865,16 +865,16 @@ name = "istio.io/api" packages = ["networking/v1alpha3"] pruneopts = "NUT" - revision = "35e06ef8d83858a2ccabd7a0d57128879b40a586" - version = "1.4.0-beta.5" + revision = "e1a1952e5b81ed914b06c1814fd3a0c92c750e37" + version = "1.4.1" [[projects]] - digest = "1:a4549838d0466ee623b1aee6220d14978e5ddbd7a65bbf40185b63b26c645fbf" + digest = "1:57e8c0255e33ab72e09219665d5ed7733a694e0092ab4a69b97100aa27bcbbb4" name = "istio.io/client-go" packages = ["pkg/apis/networking/v1alpha3"] pruneopts = "NUT" - revision = "9bd0ba57c3d24745eac756d3df8411d969f94d34" - version = "1.4.0-beta.5" + revision = "26c62a04cdbc1fb52dd71a9194b0d49ce297e836" + version = "1.4.1" [[projects]] digest = "1:9c9f11af1b1f2ae03d897ba5de27103ec1c9c43605663ccdef67831d6a462a30" diff --git a/Gopkg.toml b/Gopkg.toml index 8964cd599..8c7817813 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -44,11 +44,11 @@ required = [ [[constraint]] name = "istio.io/api" - version = "1.4.0-beta.4" + version = "1.4.1" [[constraint]] name = "istio.io/client-go" - version = "1.4.0-beta.2" + version = "1.4.1" [[override]] name = "gopkg.in/yaml.v2" diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index f8e44ba43..f39575e92 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -9,9 +9,6 @@ aliases: - vaikas - n3wscott - apis-istio-approvers: - - tcnghia - apis-duck-approvers: - mattmoor - vaikas diff --git a/hack/istio-client-missing-group-name.patch b/hack/istio-client-missing-group-name.patch deleted file mode 100644 index d78a105e4..000000000 --- a/hack/istio-client-missing-group-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.gen.go b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go -similarity index 84% -rename from vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.gen.go -rename to vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go -index 4fb1dd2..ecc1ecc 100644 ---- a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.gen.go -+++ b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go -@@ -3,4 +3,5 @@ - // Package has auto-generated kube type wrappers for raw types. - // +k8s:openapi-gen=true - // +k8s:deepcopy-gen=package -+// +groupName=networking.istio.io - package v1alpha3 diff --git a/hack/update-deps.sh b/hack/update-deps.sh index 8a89135f6..97b1cfefb 100755 --- a/hack/update-deps.sh +++ b/hack/update-deps.sh @@ -28,9 +28,3 @@ dep ensure rm -rf $(find vendor/ -name 'OWNERS') rm -rf $(find vendor/ -name '*_test.go') - -# HACK HACK HACK -# Currently istio.io/client-go apis are missing groupName comment tags and that -# breaks our (and theirs for that matter) generated fake client sets. -# TODO(skaslev): Remove after istio/tools#549 and istio/client-go#22 get merged. -git apply ${REPO_ROOT_DIR}/hack/istio-client-missing-group-name.patch diff --git a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go index ecc1ecc6d..a347b27ff 100644 --- a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go +++ b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/doc.go @@ -1,3 +1,17 @@ +// Copyright Istio Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by kubetype-gen. DO NOT EDIT. // Package has auto-generated kube type wrappers for raw types. diff --git a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/register.gen.go b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/register.gen.go index 2fd23724f..43324097b 100644 --- a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/register.gen.go +++ b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/register.gen.go @@ -1,3 +1,17 @@ +// Copyright Istio Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by kubetype-gen. DO NOT EDIT. package v1alpha3 diff --git a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/types.gen.go b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/types.gen.go index 617016979..cfe30a81a 100644 --- a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/types.gen.go +++ b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/types.gen.go @@ -1,3 +1,17 @@ +// Copyright Istio Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by kubetype-gen. DO NOT EDIT. package v1alpha3 diff --git a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/zz_generated.deepcopy.gen.go b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/zz_generated.deepcopy.gen.go index 41b8d46cd..b2a789d5a 100644 --- a/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/zz_generated.deepcopy.gen.go +++ b/vendor/istio.io/client-go/pkg/apis/networking/v1alpha3/zz_generated.deepcopy.gen.go @@ -1,5 +1,19 @@ // +build !ignore_autogenerated +// Copyright Istio Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // Code generated by deepcopy-gen. DO NOT EDIT. package v1alpha3