From 013ff3af6adf279408bdb1316081b5b2b6b9a2d0 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Sep 29 2020 22:24:13 +0000
Subject: Update to 1.18.9


Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index eb8a5df..f45a15e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /apiextensions-apiserver-kubernetes-1.17.2.tar.gz
 /apiextensions-apiserver-kubernetes-1.18.1.tar.gz
 /apiextensions-apiserver-kubernetes-1.18.3.tar.gz
+/apiextensions-apiserver-kubernetes-1.18.9.tar.gz
diff --git a/golang-k8s-apiextensions-apiserver.spec b/golang-k8s-apiextensions-apiserver.spec
index 60e92d3..7f8a4f5 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.3
-%global tag             kubernetes-1.18.3
+Version:                1.18.9
+%global tag             kubernetes-1.18.9
 %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
@@ -120,7 +120,7 @@ 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/klog/v2)
 BuildRequires:  golang(k8s.io/kube-openapi/pkg/aggregator)
 BuildRequires:  golang(k8s.io/kube-openapi/pkg/builder)
 BuildRequires:  golang(k8s.io/kube-openapi/pkg/common)
@@ -133,12 +133,16 @@ 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-0.4/compiler)
+BuildRequires:  golang(github.com/googleapis/gnostic-0.4/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)
@@ -159,6 +163,8 @@ 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}
@@ -172,7 +178,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %if %{with check}
 %check
 # test/integration: needs network
-%gocheck -t test/integration -t pkg/controller/openapi -d pkg/apiserver/validation
+%gocheck -t test/integration -t pkg/controller/openapi -t pkg/apiserver/validation -d pkg/apiserver/schema
 %endif
 
 %files
@@ -183,6 +189,12 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %gopkgfiles
 
 %changelog
+* Wed Sep 30 00:13:17 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 1.18.9-1
+- Update to 1.18.9
+
+* Wed Aug 19 17:59:12 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 1.18.3-4
+- Use gnostic compat package
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.3-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 100850a..20cd798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apiextensions-apiserver-kubernetes-1.18.3.tar.gz) = 1966bdf19208d21c907adfb570613e3dbd2ec14b849e97f12fbc7aa9e3dfe12e28fb16a1b1434e11b3f4caf2386ebae26a31e570d5910ffbb683fce18db55da4
+SHA512 (apiextensions-apiserver-kubernetes-1.18.9.tar.gz) = 98237a41e1c366402fa2553fa555399e18a75353191304a9e5be537a2b5d744efaf3d8e3b1f0a3978a61662130085ea48831c9e15b1a6ddaa43b4e0832c35b1f