diff --git a/.gitignore b/.gitignore index f45a15e..d9a47a6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /apiextensions-apiserver-kubernetes-1.18.1.tar.gz /apiextensions-apiserver-kubernetes-1.18.3.tar.gz /apiextensions-apiserver-kubernetes-1.18.9.tar.gz +/apiextensions-apiserver-kubernetes-1.22.0.tar.gz diff --git a/golang-k8s-apiextensions-apiserver.spec b/golang-k8s-apiextensions-apiserver.spec index bbe160a..d9e8ea8 100644 --- a/golang-k8s-apiextensions-apiserver.spec +++ b/golang-k8s-apiextensions-apiserver.spec @@ -4,8 +4,8 @@ # https://github.com/kubernetes/apiextensions-apiserver %global goipath k8s.io/apiextensions-apiserver %global forgeurl https://github.com/kubernetes/apiextensions-apiserver -Version: 1.18.9 -%global tag kubernetes-1.18.9 +Version: 1.22.0 +%global tag kubernetes-1.22.0 %global distprefix %{nil} %gometa @@ -28,18 +28,14 @@ URL: %{gourl} Source0: %{gosource} BuildRequires: golang(github.com/emicklei/go-restful) -BuildRequires: golang(github.com/go-openapi/errors) -BuildRequires: golang(github.com/go-openapi/spec) -BuildRequires: golang(github.com/go-openapi/strfmt) -BuildRequires: golang(github.com/go-openapi/validate) BuildRequires: golang(github.com/gogo/protobuf/proto) BuildRequires: golang(github.com/gogo/protobuf/sortkeys) BuildRequires: golang(github.com/google/gofuzz) BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(github.com/spf13/cobra) BuildRequires: golang(github.com/spf13/pflag) -BuildRequires: golang(go.etcd.io/etcd/clientv3) -BuildRequires: golang(go.etcd.io/etcd/pkg/transport) +BuildRequires: golang(go.etcd.io/etcd/client/pkg/v3/transport) +BuildRequires: golang(go.etcd.io/etcd/client/v3) BuildRequires: golang(google.golang.org/grpc) BuildRequires: golang(k8s.io/api/autoscaling/v1) BuildRequires: golang(k8s.io/apimachinery/pkg/api/equality) @@ -101,6 +97,7 @@ BuildRequires: golang(k8s.io/apiserver/pkg/util/feature) BuildRequires: golang(k8s.io/apiserver/pkg/util/openapi) BuildRequires: golang(k8s.io/apiserver/pkg/util/proxy) BuildRequires: golang(k8s.io/apiserver/pkg/util/webhook) +BuildRequires: golang(k8s.io/apiserver/pkg/warning) BuildRequires: golang(k8s.io/client-go/discovery) BuildRequires: golang(k8s.io/client-go/discovery/fake) BuildRequires: golang(k8s.io/client-go/dynamic) @@ -127,22 +124,22 @@ BuildRequires: golang(k8s.io/kube-openapi/pkg/common) BuildRequires: golang(k8s.io/kube-openapi/pkg/handler) BuildRequires: golang(k8s.io/kube-openapi/pkg/util) BuildRequires: golang(k8s.io/kube-openapi/pkg/util/proto) +BuildRequires: golang(k8s.io/kube-openapi/pkg/validation/errors) +BuildRequires: golang(k8s.io/kube-openapi/pkg/validation/spec) +BuildRequires: golang(k8s.io/kube-openapi/pkg/validation/strfmt) +BuildRequires: golang(k8s.io/kube-openapi/pkg/validation/validate) BuildRequires: golang(k8s.io/utils/pointer) BuildRequires: golang(k8s.io/utils/trace) +BuildRequires: golang(sigs.k8s.io/structured-merge-diff/v4/fieldpath) %if %{with check} # Tests BuildRequires: golang(github.com/google/go-cmp/cmp) -BuildRequires: golang(github.com/googleapis/gnostic-0.4/compiler) -BuildRequires: golang(github.com/googleapis/gnostic-0.4/openapiv2) +BuildRequires: golang(github.com/googleapis/gnostic/openapiv2) BuildRequires: golang(github.com/stretchr/testify/assert) BuildRequires: golang(github.com/stretchr/testify/require) BuildRequires: golang(gopkg.in/yaml.v2) BuildRequires: golang(k8s.io/api/core/v1) -BuildRequires: golang(k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/fuzzer) -BuildRequires: golang(k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake) -BuildRequires: golang(k8s.io/apiextensions-apiserver/test/integration/fixtures) -BuildRequires: golang(k8s.io/apiextensions-apiserver/test/integration/storage) BuildRequires: golang(k8s.io/apimachinery/pkg/api/apitesting/fuzzer) BuildRequires: golang(k8s.io/apimachinery/pkg/api/apitesting/roundtrip) BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/fuzzer) @@ -162,9 +159,6 @@ BuildRequires: golang(sigs.k8s.io/yaml) %prep %goprep -sed -i "s|github.com/googleapis/gnostic/OpenAPIv2|github.com/googleapis/gnostic/openapiv2|" $(find . -name "*.go") -sed -i "s|k8s.io/klog/v2|k8s.io/klog|" $(find . -type f -iname "*.go") -sed -i 's|github.com/googleapis/gnostic|github.com/googleapis/gnostic-0.4|' $(find . -iname "*.go" -type f) %build %gobuild -o %{gobuilddir}/bin/apiextensions-apiserver %{goipath} diff --git a/sources b/sources index 20cd798..6394fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apiextensions-apiserver-kubernetes-1.18.9.tar.gz) = 98237a41e1c366402fa2553fa555399e18a75353191304a9e5be537a2b5d744efaf3d8e3b1f0a3978a61662130085ea48831c9e15b1a6ddaa43b4e0832c35b1f +SHA512 (apiextensions-apiserver-kubernetes-1.22.0.tar.gz) = c3353ed15284d43a2cadb8e004a6618c0c9fdbe69041ee694d2f919607790d1a46db1b994f2f9b69196922a0f23d79186cbe19605f2f9f5d869b61c2f9dcf9aa