From 5c5a327c92457ea867e412a22c40cef897dd04b3 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Sep 21 2020 22:30:15 +0000 Subject: Update to 1.18.9 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index cf52024..593b269 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /legacy-cloud-providers-kubernetes-1.15.0.tar.gz +/legacy-cloud-providers-kubernetes-1.18.3.tar.gz +/legacy-cloud-providers-kubernetes-1.18.9.tar.gz diff --git a/0001-Fix-for-newer-azure-sdk-for-go.patch b/0001-Fix-for-newer-azure-sdk-for-go.patch deleted file mode 100644 index ee2ccf5..0000000 --- a/0001-Fix-for-newer-azure-sdk-for-go.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up legacy-cloud-providers-kubernetes-1.15.0/azure/azure_blobDiskController.go.fix_azure_api legacy-cloud-providers-kubernetes-1.15.0/azure/azure_blobDiskController.go ---- legacy-cloud-providers-kubernetes-1.15.0/azure/azure_blobDiskController.go.fix_azure_api 2019-06-20 11:01:56.000000000 +0200 -+++ legacy-cloud-providers-kubernetes-1.15.0/azure/azure_blobDiskController.go 2019-07-08 22:57:22.410835745 +0200 -@@ -598,7 +598,7 @@ func (c *BlobDiskController) findSANameF - func (c *BlobDiskController) getStorageAccountState(storageAccountName string) (bool, storage.ProvisioningState, error) { - ctx, cancel := getContextWithCancel() - defer cancel() -- account, err := c.common.cloud.StorageAccountClient.GetProperties(ctx, c.common.resourceGroup, storageAccountName) -+ account, err := c.common.cloud.StorageAccountClient.GetProperties(ctx, c.common.resourceGroup, storageAccountName, "") - if err != nil { - return false, "", err - } -diff -up legacy-cloud-providers-kubernetes-1.15.0/azure/azure_client.go.fix_azure_api legacy-cloud-providers-kubernetes-1.15.0/azure/azure_client.go ---- legacy-cloud-providers-kubernetes-1.15.0/azure/azure_client.go.fix_azure_api 2019-06-20 11:01:56.000000000 +0200 -+++ legacy-cloud-providers-kubernetes-1.15.0/azure/azure_client.go 2019-07-08 22:58:27.285423006 +0200 -@@ -124,7 +124,7 @@ type StorageAccountClient interface { - Delete(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error) - ListKeys(ctx context.Context, resourceGroupName string, accountName string) (result storage.AccountListKeysResult, err error) - ListByResourceGroup(ctx context.Context, resourceGroupName string) (result storage.AccountListResult, err error) -- GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error) -+ GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error) - } - - // DisksClient defines needed functions for azure compute.DisksClient -@@ -1339,7 +1339,7 @@ func (az *azStorageAccountClient) ListBy - return - } - --func (az *azStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error) { -+func (az *azStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error) { - if !az.rateLimiterReader.TryAccept() { - err = createRateLimitErr(false, "GetStorageAccount/Properties") - return -@@ -1351,7 +1351,7 @@ func (az *azStorageAccountClient) GetPro - }() - - mc := newMetricContext("storage_account", "get_properties", resourceGroupName, az.client.SubscriptionID, "") -- result, err = az.client.GetProperties(ctx, resourceGroupName, accountName) -+ result, err = az.client.GetProperties(ctx, resourceGroupName, accountName, expand) - mc.Observe(err) - return - } -diff -up legacy-cloud-providers-kubernetes-1.15.0/azure/azure_fakes.go.fix_azure_api legacy-cloud-providers-kubernetes-1.15.0/azure/azure_fakes.go ---- legacy-cloud-providers-kubernetes-1.15.0/azure/azure_fakes.go.fix_azure_api 2019-06-20 11:01:56.000000000 +0200 -+++ legacy-cloud-providers-kubernetes-1.15.0/azure/azure_fakes.go 2019-07-08 22:58:48.499288038 +0200 -@@ -796,7 +796,7 @@ func (fSAC *fakeStorageAccountClient) Li - return fSAC.Accounts, fSAC.Err - } - --func (fSAC *fakeStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error) { -+func (fSAC *fakeStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error) { - fSAC.mutex.Lock() - defer fSAC.mutex.Unlock() - diff --git a/0001-make-changes-due-to-azure-sdk-upgrade.patch b/0001-make-changes-due-to-azure-sdk-upgrade.patch new file mode 100644 index 0000000..5d234c1 --- /dev/null +++ b/0001-make-changes-due-to-azure-sdk-upgrade.patch @@ -0,0 +1,41 @@ +From 90e25645571c35eded44e00f343245884cc60a85 Mon Sep 17 00:00:00 2001 +From: andyzhangx +Date: Fri, 13 Mar 2020 09:15:35 +0000 +Subject: [PATCH] fix: make changes due to azure sdk upgrade + +feat: fix disks client failure + +fix: revert api-version change + +revert disks client change + +Kubernetes-commit: dd9474e78ebc3f10caf8d2ea3a9bccc7cb8736ec +--- + azure/azure_blobDiskController.go | 4 ++-- + azure/azure_managedDiskController.go | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/azure/azure_blobDiskController.go b/azure/azure_blobDiskController.go +index 9dc6c45..6c59cf4 100644 +--- a/azure/azure_blobDiskController.go ++++ b/azure/azure_blobDiskController.go +--- legacy-cloud-providers-kubernetes-1.18.3/azure/azure_blobDiskController.go.orig 2020-05-20 19:20:19.000000000 +0200 ++++ legacy-cloud-providers-kubernetes-1.18.3/azure/azure_blobDiskController.go 2020-08-18 22:07:29.305460243 +0200 +@@ -344,7 +344,7 @@ func (c *BlobDiskController) ensureDefau + } + + // account exists but not ready yet +- if provisionState != storage.ProvisioningStateSucceeded { ++ if provisionState != storage.Succeeded { + // we don't want many attempts to validate the account readiness + // here hence we are locking + counter := 1 +@@ -375,7 +375,7 @@ func (c *BlobDiskController) ensureDefau + return false, nil // error performing the query - retryable + } + +- if provisionState == storage.ProvisioningStateSucceeded { ++ if provisionState == storage.Succeeded { + return true, nil + } + diff --git a/Conversion-to-klog-v2.patch b/Conversion-to-klog-v2.patch new file mode 100644 index 0000000..e9d8cbf --- /dev/null +++ b/Conversion-to-klog-v2.patch @@ -0,0 +1,27 @@ +From 809a893d24f8c269d9fc79569b72211abd435a29 Mon Sep 17 00:00:00 2001 +From: Davanum Srinivas +Date: Fri, 17 Apr 2020 15:25:06 -0400 +Subject: [PATCH] switch over k/k to use klog v2 + +Signed-off-by: Davanum Srinivas + +Kubernetes-commit: 442a69c3bdf6fe8e525b05887e57d89db1e2f3a5 +--- + + vsphere/vclib/connection.go | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + +diff --git a/vsphere/vclib/connection.go b/vsphere/vclib/connection.go +index 44cc163..b726cc1 100644 +--- a/vsphere/vclib/connection.go ++++ b/vsphere/vclib/connection.go +@@ -204,7 +204,7 @@ func (connection *VSphereConnection) NewClient(ctx context.Context) (*vim25.Clie + if err != nil { + return nil, err + } +- if klog.V(3) { ++ if klog.V(3).Enabled() { + s, err := session.NewManager(client).UserSession(ctx) + if err == nil { + klog.Infof("New session ID for '%s' = %s", s.UserName, s.Key) diff --git a/Use-gophercloud-utils-for-IDFromName.patch b/Use-gophercloud-utils-for-IDFromName.patch new file mode 100644 index 0000000..b4b0c83 --- /dev/null +++ b/Use-gophercloud-utils-for-IDFromName.patch @@ -0,0 +1,47 @@ +diff -up legacy-cloud-providers-kubernetes-1.18.3/openstack/openstack_loadbalancer.go.orig legacy-cloud-providers-kubernetes-1.18.3/openstack/openstack_loadbalancer.go +--- legacy-cloud-providers-kubernetes-1.18.3/openstack/openstack_loadbalancer.go.orig 2020-05-20 19:20:19.000000000 +0200 ++++ legacy-cloud-providers-kubernetes-1.18.3/openstack/openstack_loadbalancer.go 2020-08-18 22:39:52.485453684 +0200 +@@ -39,6 +39,7 @@ import ( + "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" + neutronports "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/pagination" ++ utils "github.com/gophercloud/utils/openstack/networking/v2/extensions/security/groups" + "k8s.io/klog" + + v1 "k8s.io/api/core/v1" +@@ -585,7 +586,7 @@ func getNodeSecurityGroupIDForLB(compute + + secGroupIDs := make([]string, secGroupNames.Len()) + for i, name := range secGroupNames.List() { +- secGroupID, err := groups.IDFromName(network, name) ++ secGroupID, err := utils.IDFromName(network, name) + if err != nil { + return []string{}, err + } +@@ -1033,7 +1034,7 @@ func (lbaas *LbaasV2) ensureSecurityGrou + + // ensure security group for LB + lbSecGroupName := getSecurityGroupName(apiService) +- lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) ++ lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) + if err != nil { + // If the security group of LB not exist, create it later + if isSecurityGroupNotFound(err) { +@@ -1338,7 +1339,7 @@ func (lbaas *LbaasV2) updateSecurityGrou + + // Generate Name + lbSecGroupName := getSecurityGroupName(apiService) +- lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) ++ lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) + if err != nil { + return fmt.Errorf("error occurred finding security group: %s: %v", lbSecGroupName, err) + } +@@ -1530,7 +1531,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer + func (lbaas *LbaasV2) EnsureSecurityGroupDeleted(clusterName string, service *v1.Service) error { + // Generate Name + lbSecGroupName := getSecurityGroupName(service) +- lbSecGroupID, err := groups.IDFromName(lbaas.network, lbSecGroupName) ++ lbSecGroupID, err := utils.IDFromName(lbaas.network, lbSecGroupName) + if err != nil { + if isSecurityGroupNotFound(err) { + // It is OK when the security group has been deleted by others. diff --git a/golang-k8s-legacy-cloud-providers.spec b/golang-k8s-legacy-cloud-providers.spec index 9dcd137..e3d8bf3 100644 --- a/golang-k8s-legacy-cloud-providers.spec +++ b/golang-k8s-legacy-cloud-providers.spec @@ -4,8 +4,8 @@ # https://github.com/kubernetes/legacy-cloud-providers %global goipath k8s.io/legacy-cloud-providers %global forgeurl https://github.com/kubernetes/legacy-cloud-providers -Version: 1.15.0 -%global tag kubernetes-1.15.0 +Version: 1.18.9 +%global tag kubernetes-1.18.9 %global distprefix %{nil} %gometa @@ -19,15 +19,19 @@ of their Kubernetes cloud provider.} %global godocs README.md code-of-conduct.md Name: %{goname} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Legacy in-tree cloud providers # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -# Newer azure-sdk-for-go has changed API for GetProperties -Patch0: 0001-Fix-for-newer-azure-sdk-for-go.patch +# make changes due to azure sdk upgrade +Patch0: https://github.com/kubernetes/legacy-cloud-providers/commit/90e25645571c35eded44e00f343245884cc60a85.patch#/0001-make-changes-due-to-azure-sdk-upgrade.patch +# * The various `IDFromName` convenience functions have been moved to https://github.com/gophercloud/utils [GH-1897](https://github.com/gophercloud/gophercloud/pull/1897) +Patch1: Use-gophercloud-utils-for-IDFromName.patch +# To use k8s.io/klog/v2 (from upstream) +Patch2: Conversion-to-klog-v2.patch BuildRequires: golang(cloud.google.com/go/compute/metadata) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) @@ -45,19 +49,46 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/elb) BuildRequires: golang(github.com/aws/aws-sdk-go/service/elbv2) BuildRequires: golang(github.com/aws/aws-sdk-go/service/kms) BuildRequires: golang(github.com/aws/aws-sdk-go/service/sts) -BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute) -BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-07-01/network) -BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-07-01/storage) +BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute) +BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network) +BuildRequires: golang(github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage) BuildRequires: golang(github.com/Azure/azure-sdk-for-go/storage) BuildRequires: golang(github.com/Azure/go-autorest/autorest) BuildRequires: golang(github.com/Azure/go-autorest/autorest/adal) BuildRequires: golang(github.com/Azure/go-autorest/autorest/azure) +BuildRequires: golang(github.com/Azure/go-autorest/autorest/mocks) BuildRequires: golang(github.com/Azure/go-autorest/autorest/to) +BuildRequires: golang(github.com/golang/mock/gomock) BuildRequires: golang(github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud) BuildRequires: golang(github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter) BuildRequires: golang(github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta) BuildRequires: golang(github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock) -BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/gophercloud/gophercloud) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/compute/v2/servers) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/identity/v3/extensions/trusts) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/identity/v3/tokens) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/networks) +BuildRequires: golang(github.com/gophercloud/gophercloud/openstack/networking/v2/ports) +BuildRequires: golang(github.com/gophercloud/gophercloud/pagination) +BuildRequires: golang(github.com/gophercloud/utils/openstack/networking/v2/extensions/security/groups) +BuildRequires: golang(github.com/mitchellh/mapstructure) BuildRequires: golang(github.com/rubiojr/go-vhd/vhd) BuildRequires: golang(github.com/vmware/govmomi/find) BuildRequires: golang(github.com/vmware/govmomi/lookup/simulator) @@ -84,6 +115,7 @@ BuildRequires: golang(google.golang.org/api/compute/v0.beta) BuildRequires: golang(google.golang.org/api/compute/v1) BuildRequires: golang(google.golang.org/api/container/v1) BuildRequires: golang(google.golang.org/api/googleapi) +BuildRequires: golang(google.golang.org/api/option) BuildRequires: golang(google.golang.org/api/tpu/v1) BuildRequires: golang(gopkg.in/gcfg.v1) BuildRequires: golang(k8s.io/api/core/v1) @@ -94,19 +126,25 @@ BuildRequires: golang(k8s.io/apimachinery/pkg/fields) BuildRequires: golang(k8s.io/apimachinery/pkg/runtime) BuildRequires: golang(k8s.io/apimachinery/pkg/types) BuildRequires: golang(k8s.io/apimachinery/pkg/util/errors) +BuildRequires: golang(k8s.io/apimachinery/pkg/util/net) BuildRequires: golang(k8s.io/apimachinery/pkg/util/sets) BuildRequires: golang(k8s.io/apimachinery/pkg/util/uuid) BuildRequires: golang(k8s.io/apimachinery/pkg/util/version) BuildRequires: golang(k8s.io/apimachinery/pkg/util/wait) BuildRequires: golang(k8s.io/apimachinery/pkg/watch) +BuildRequires: golang(k8s.io/apiserver/pkg/util/feature) BuildRequires: golang(k8s.io/client-go/informers) +BuildRequires: golang(k8s.io/client-go/informers/core/v1) BuildRequires: golang(k8s.io/client-go/kubernetes) +BuildRequires: golang(k8s.io/client-go/kubernetes/fake) BuildRequires: golang(k8s.io/client-go/kubernetes/scheme) BuildRequires: golang(k8s.io/client-go/kubernetes/typed/core/v1) BuildRequires: golang(k8s.io/client-go/listers/core/v1) BuildRequires: golang(k8s.io/client-go/pkg/version) BuildRequires: golang(k8s.io/client-go/tools/cache) +BuildRequires: golang(k8s.io/client-go/tools/clientcmd) BuildRequires: golang(k8s.io/client-go/tools/record) +BuildRequires: golang(k8s.io/client-go/util/cert) BuildRequires: golang(k8s.io/client-go/util/flowcontrol) BuildRequires: golang(k8s.io/cloud-provider) BuildRequires: golang(k8s.io/cloud-provider/node/helpers) @@ -114,9 +152,13 @@ BuildRequires: golang(k8s.io/cloud-provider/service/helpers) BuildRequires: golang(k8s.io/cloud-provider/volume) BuildRequires: golang(k8s.io/cloud-provider/volume/errors) BuildRequires: golang(k8s.io/cloud-provider/volume/helpers) +BuildRequires: golang(k8s.io/component-base/featuregate) +BuildRequires: golang(k8s.io/component-base/metrics) +BuildRequires: golang(k8s.io/component-base/metrics/legacyregistry) BuildRequires: golang(k8s.io/csi-translation-lib/plugins) BuildRequires: golang(k8s.io/klog) -BuildRequires: golang(k8s.io/utils/keymutex) +BuildRequires: golang(k8s.io/utils/exec) +BuildRequires: golang(k8s.io/utils/mount) BuildRequires: golang(k8s.io/utils/net) BuildRequires: golang(sigs.k8s.io/yaml) @@ -129,7 +171,7 @@ BuildRequires: golang(github.com/vmware/govmomi) BuildRequires: golang(github.com/vmware/govmomi/simulator/vpx) BuildRequires: golang(k8s.io/apimachinery/pkg/labels) BuildRequires: golang(k8s.io/apimachinery/pkg/util/rand) -BuildRequires: golang(k8s.io/client-go/kubernetes/fake) +BuildRequires: golang(k8s.io/utils/pointer) %endif %description @@ -140,18 +182,27 @@ BuildRequires: golang(k8s.io/client-go/kubernetes/fake) %prep %goprep %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +sed -i 's|k8s.io/klog|k8s.io/klog/v2|' $(find . -iname "*.go" -type f) %install %gopkginstall %if %{with check} %check -%gocheck +%gocheck -d azure/cache %endif %gopkgfiles %changelog +* Mon Sep 21 23:07:22 CEST 2020 Robert-André Mauchin - 1.18.9-1 +- Update to 1.18.9 + +* Tue Aug 18 21:48:36 CEST 2020 Robert-André Mauchin - 1.18.3-1 +- Update to 1.18.3 + * Sat Aug 01 2020 Fedora Release Engineering - 1.15.0-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a390858..d48de04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (legacy-cloud-providers-kubernetes-1.15.0.tar.gz) = 89300741fb6849935bdf3844f0a8d09c995fba0c3a7bec1b069447e990dd75a4907f471f83c662b6b49f0155c0125e1886594da816fbeae8e0ccd6315663ec98 +SHA512 (legacy-cloud-providers-kubernetes-1.18.9.tar.gz) = fe0c5e8557b12c1ef7db3768e27d0d79853b118db997f6cd1eebda0071b36e9581c89aa5bc70b784a140e26571af9d2a9f72b5860943d3d5528328439cb02843