From 2cf4103968c5c4e69a6826af7ef8ff42eac79041 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jul 06 2020 15:40:12 +0000 Subject: Update to 1.18.3 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 8c7b5cb..eb8a5df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /apiextensions-apiserver-kubernetes-1.13.7-beta.0.tar.gz /apiextensions-apiserver-kubernetes-1.15.0.tar.gz +/apiextensions-apiserver-kubernetes-1.17.2.tar.gz +/apiextensions-apiserver-kubernetes-1.18.1.tar.gz +/apiextensions-apiserver-kubernetes-1.18.3.tar.gz diff --git a/golang-k8s-apiextensions-apiserver.spec b/golang-k8s-apiextensions-apiserver.spec index 63361a4..071daca 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.15.0 -%global tag kubernetes-1.15.0 +Version: 1.18.3 +%global tag kubernetes-1.18.3 %global distprefix %{nil} %gometa @@ -19,7 +19,7 @@ API server for API extensions like CustomResourceDefinitions.} %global gosupfiles "${examples[@]}" Name: %{goname} -Release: 3%{?dist} +Release: 1%{?dist} Summary: API server for API extensions like CustomResourceDefinitions # Upstream license specification: Apache-2.0 @@ -28,18 +28,19 @@ 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/pborman/uuid) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +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(google.golang.org/grpc) BuildRequires: golang(k8s.io/api/autoscaling/v1) BuildRequires: golang(k8s.io/apimachinery/pkg/api/equality) BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors) @@ -97,6 +98,7 @@ BuildRequires: golang(k8s.io/apiserver/pkg/storage/names) BuildRequires: golang(k8s.io/apiserver/pkg/storage/storagebackend) BuildRequires: golang(k8s.io/apiserver/pkg/util/dryrun) 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/client-go/discovery) @@ -116,18 +118,23 @@ BuildRequires: golang(k8s.io/client-go/util/jsonpath) BuildRequires: golang(k8s.io/client-go/util/workqueue) BuildRequires: golang(k8s.io/component-base/featuregate) BuildRequires: golang(k8s.io/component-base/logs) +BuildRequires: golang(k8s.io/component-base/metrics) +BuildRequires: golang(k8s.io/component-base/metrics/legacyregistry) BuildRequires: golang(k8s.io/klog) +BuildRequires: golang(k8s.io/kube-openapi/pkg/aggregator) BuildRequires: golang(k8s.io/kube-openapi/pkg/builder) 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/utils/pointer) +BuildRequires: golang(k8s.io/utils/trace) %if %{with check} # Tests BuildRequires: golang(github.com/google/go-cmp/cmp) BuildRequires: golang(github.com/googleapis/gnostic/compiler) -BuildRequires: golang(github.com/googleapis/gnostic/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) @@ -136,11 +143,11 @@ 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) BuildRequires: golang(k8s.io/apimachinery/pkg/util/diff) -BuildRequires: golang(k8s.io/apimachinery/pkg/util/rand) BuildRequires: golang(k8s.io/apimachinery/pkg/util/yaml) BuildRequires: golang(k8s.io/apiserver/pkg/storage/etcd3) +BuildRequires: golang(k8s.io/apiserver/pkg/storage/etcd3/testing) +BuildRequires: golang(k8s.io/client-go/util/retry) BuildRequires: golang(k8s.io/component-base/featuregate/testing) -BuildRequires: golang(k8s.io/kube-openapi/pkg/util/proto) BuildRequires: golang(sigs.k8s.io/yaml) %endif @@ -151,7 +158,7 @@ BuildRequires: golang(sigs.k8s.io/yaml) %prep %goprep -find . -name "*.go" -exec sed -i "s|github.com/coreos/etcd|go.etcd.io/etcd|" "{}" +; +sed -i "s|github.com/googleapis/gnostic/OpenAPIv2|github.com/googleapis/gnostic/openapiv2|" $(find . -name "*.go") %build %gobuild -o %{gobuilddir}/bin/apiextensions-apiserver %{goipath} @@ -165,7 +172,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %if %{with check} %check # test/integration: needs network -%gocheck -t test/integration -d pkg/controller/openapi +%gocheck -t test/integration -t pkg/controller/openapi -d pkg/apiserver/validation %endif %files @@ -176,6 +183,15 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %gopkgfiles %changelog +* Mon Jul 06 17:02:29 CEST 2020 Robert-André Mauchin - 1.18.3-1 +- Update to 1.18.3 + +* Sun Apr 12 21:14:05 CEST 2020 Robert-André Mauchin - 1.18.1-1 +- Update to 1.18.1 + +* Wed Feb 05 22:02:17 CET 2020 Robert-André Mauchin - 1.17.2-1 +- Update to 1.17.2 + * Wed Jan 29 2020 Fedora Release Engineering - 1.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index aeda3f6..100850a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apiextensions-apiserver-kubernetes-1.15.0.tar.gz) = 534213e32255091c51f9b0b4d7e59f9fc21ef2ad44d437d3c6bb2e3fee540d4f349297577c4c20060e47025ae8c414bc9e82b3d86cac9ac51765882a7a0fbe07 +SHA512 (apiextensions-apiserver-kubernetes-1.18.3.tar.gz) = 1966bdf19208d21c907adfb570613e3dbd2ec14b849e97f12fbc7aa9e3dfe12e28fb16a1b1434e11b3f4caf2386ebae26a31e570d5910ffbb683fce18db55da4