From 1c4849af338e42e6752c7d8a329fd700afa7baf6 Mon Sep 17 00:00:00 2001 From: Rahul Ganesh Date: Mon, 15 Apr 2024 23:54:29 +0000 Subject: [PATCH] bump capv version to 1.9.3 Signed-off-by: Rahul Ganesh --- .../ATTRIBUTION.txt | 762 ++++++------------ .../cluster-api-provider-vsphere/CHECKSUMS | 4 +- .../cluster-api-provider-vsphere/GIT_TAG | 2 +- .../GOLANG_VERSION | 2 +- ...01-Add-capv-support-for-Bottlerocket.patch | 15 +- 5 files changed, 280 insertions(+), 505 deletions(-) diff --git a/projects/kubernetes-sigs/cluster-api-provider-vsphere/ATTRIBUTION.txt b/projects/kubernetes-sigs/cluster-api-provider-vsphere/ATTRIBUTION.txt index 526c5652ca..a04e8a7893 100644 --- a/projects/kubernetes-sigs/cluster-api-provider-vsphere/ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/cluster-api-provider-vsphere/ATTRIBUTION.txt @@ -1,23 +1,23 @@ -** github.com/coredns/caddy/caddyfile; version v1.1.1 -- -https://github.com/coredns/caddy +** github.com/coreos/go-semver/semver; version v0.3.1 -- +https://github.com/coreos/go-semver -** github.com/coredns/corefile-migration/migration; version v1.0.21 -- -https://github.com/coredns/corefile-migration +** github.com/coreos/go-systemd/v22; version v22.5.0 -- +https://github.com/coreos/go-systemd/v22 -** github.com/docker/distribution; version v2.8.2+incompatible -- -https://github.com/distribution/distribution - -** github.com/go-logr/logr; version v1.2.4 -- +** github.com/go-logr/logr; version v1.4.1 -- https://github.com/go-logr/logr +** github.com/go-logr/stdr; version v1.2.2 -- +https://github.com/go-logr/stdr + ** github.com/go-logr/zapr; version v1.2.4 -- https://github.com/go-logr/zapr ** github.com/go-openapi/jsonpointer; version v0.19.6 -- https://github.com/go-openapi/jsonpointer -** github.com/go-openapi/jsonreference; version v0.20.1 -- +** github.com/go-openapi/jsonreference; version v0.20.2 -- https://github.com/go-openapi/jsonreference ** github.com/go-openapi/swag; version v0.22.3 -- @@ -26,12 +26,18 @@ https://github.com/go-openapi/swag ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da -- https://github.com/golang/groupcache -** github.com/google/gnostic; version v0.6.9 -- -https://github.com/google/gnostic +** github.com/google/cel-go; version v0.16.1 -- +https://github.com/google/cel-go + +** github.com/google/gnostic-models; version v0.6.8 -- +https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz +** github.com/grpc-ecosystem/go-grpc-prometheus; version v1.2.0 -- +https://github.com/grpc-ecosystem/go-grpc-prometheus + ** github.com/matttproud/golang_protobuf_extensions/pbutil; version v1.0.4 -- https://github.com/matttproud/golang_protobuf_extensions @@ -41,85 +47,145 @@ https://github.com/modern-go/concurrent ** github.com/modern-go/reflect2; version v1.0.2 -- https://github.com/modern-go/reflect2 -** github.com/opencontainers/go-digest; version v1.0.0 -- -https://github.com/opencontainers/go-digest +** github.com/NYTimes/gziphandler; version v1.1.1 -- +https://github.com/nytimes/gziphandler -** github.com/prometheus/client_golang/prometheus; version v1.16.0 -- +** github.com/prometheus/client_golang/prometheus; version v1.17.0 -- https://github.com/prometheus/client_golang -** github.com/prometheus/client_model/go; version v0.4.0 -- +** github.com/prometheus/client_model/go; version v0.4.1-0.20230718164431-9a2bf3000d16 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.42.0 -- +** github.com/prometheus/common; version v0.44.0 -- https://github.com/prometheus/common -** github.com/prometheus/procfs; version v0.10.1 -- +** github.com/prometheus/procfs; version v0.11.1 -- https://github.com/prometheus/procfs -** github.com/spf13/cobra; version v1.7.0 -- +** github.com/spf13/cobra; version v1.8.0 -- https://github.com/spf13/cobra -** github.com/vmware-tanzu/net-operator-api/api/v1alpha1; version v0.0.0-20210401185409-b0dc6c297707 -- +** github.com/vmware-tanzu/net-operator-api/api/v1alpha1; version v0.0.0-20231019160108-42131d6e8360 -- https://github.com/vmware-tanzu/net-operator-api -** github.com/vmware-tanzu/vm-operator/api/v1alpha1; version v1.8.2 -- +** github.com/vmware-tanzu/vm-operator/api; version v1.8.5 -- https://github.com/vmware-tanzu/vm-operator/api -** github.com/vmware-tanzu/vm-operator/api/v1alpha2; version v1.8.2 -- +** github.com/vmware-tanzu/vm-operator/api/v1alpha1; version v1.8.5 -- https://github.com/vmware-tanzu/vm-operator/api -** github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1; version v0.0.0-20211209213435-0f4ab286f64f -- +** github.com/vmware-tanzu/vm-operator/external/ncp/api/v1alpha1; version v0.0.0-20231214185006-5477585eebfd -- https://github.com/vmware-tanzu/vm-operator/external/ncp -** github.com/vmware-tanzu/vm-operator/external/tanzu-topology/api/v1alpha1; version v0.0.0-20211209213435-0f4ab286f64f -- +** github.com/vmware-tanzu/vm-operator/external/tanzu-topology/api/v1alpha1; version v0.0.0-20231214185006-5477585eebfd -- https://github.com/vmware-tanzu/vm-operator/external/tanzu-topology -** github.com/vmware/govmomi; version v0.34.0 -- +** github.com/vmware/govmomi; version v0.34.2 -- https://github.com/vmware/govmomi -** gomodules.xyz/jsonpatch/v2; version v2.3.0 -- +** go.etcd.io/etcd/api/v3; version v3.5.10 -- +https://github.com/etcd-io/etcd + +** go.etcd.io/etcd/client/pkg/v3; version v3.5.10 -- +https://github.com/etcd-io/etcd + +** go.etcd.io/etcd/client/v3; version v3.5.10 -- +https://github.com/etcd-io/etcd + +** go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc; version v0.46.0 -- +https://github.com/open-telemetry/opentelemetry-go-contrib + +** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.46.0 -- +https://github.com/open-telemetry/opentelemetry-go-contrib + +** go.opentelemetry.io/otel; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/metric; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/sdk; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/otel/trace; version v1.20.0 -- +https://github.com/open-telemetry/opentelemetry-go + +** go.opentelemetry.io/proto/otlp; version v1.0.0 -- +https://github.com/open-telemetry/opentelemetry-proto-go + +** gomodules.xyz/jsonpatch/v2; version v2.4.0 -- https://github.com/gomodules/jsonpatch +** google.golang.org/genproto/googleapis/api; version v0.0.0-20230913181813-007df8e322eb -- +https://github.com/googleapis/go-genproto + +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20230920204549-e6e6cdab5c13 -- +https://github.com/googleapis/go-genproto + +** google.golang.org/grpc; version v1.59.0 -- +https://github.com/grpc/grpc-go + ** gopkg.in/yaml.v2; version v2.4.0 -- https://gopkg.in/yaml.v2 -** k8s.io/api; version v0.27.4 -- +** k8s.io/api; version v0.28.5 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.27.4 -- +** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.28.5 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.27.4 -- +** k8s.io/apimachinery/pkg; version v0.28.5 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go; version v0.27.4 -- +** k8s.io/apiserver; version v0.28.5 -- +https://github.com/kubernetes/apiserver + +** k8s.io/client-go; version v0.28.5 -- https://github.com/kubernetes/client-go -** k8s.io/cluster-bootstrap/token; version v0.27.4 -- +** k8s.io/cluster-bootstrap/token; version v0.28.5 -- https://github.com/kubernetes/cluster-bootstrap -** k8s.io/component-base; version v0.27.4 -- +** k8s.io/component-base; version v0.28.5 -- https://github.com/kubernetes/component-base -** k8s.io/klog/v2; version v2.90.1 -- +** k8s.io/klog/v2; version v2.100.1 -- https://github.com/kubernetes/klog -** k8s.io/kube-openapi/pkg; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kms; version v0.28.5 -- +https://github.com/kubernetes/kms + +** k8s.io/kube-openapi/pkg; version v0.0.0-20230717233707-2695361300d9 -- +https://github.com/kubernetes/kube-openapi + +** k8s.io/kube-openapi/pkg/validation/errors; version v0.0.0-20230717233707-2695361300d9 -- +https://github.com/kubernetes/kube-openapi + +** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20230717233707-2695361300d9 -- https://github.com/kubernetes/kube-openapi -** k8s.io/kube-openapi/pkg/validation/spec; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kube-openapi/pkg/validation/strfmt; version v0.0.0-20230717233707-2695361300d9 -- https://github.com/kubernetes/kube-openapi -** k8s.io/utils; version v0.0.0-20230209194617-a36077c30491 -- +** k8s.io/utils; version v0.0.0-20231127182322-b307cd553661 -- https://github.com/kubernetes/utils -** sigs.k8s.io/cluster-api; version v1.5.2 -- +** sigs.k8s.io/apiserver-network-proxy/konnectivity-client; version v0.1.2 -- +https://github.com/kubernetes-sigs/apiserver-network-proxy + +** sigs.k8s.io/cluster-api; version v1.6.1 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/cluster-api-provider-vsphere; version v1.8.5 -- +** sigs.k8s.io/cluster-api-provider-vsphere; version v1.9.3 -- https://github.com/kubernetes-sigs/cluster-api-provider-vsphere -** sigs.k8s.io/controller-runtime; version v0.15.1 -- +** sigs.k8s.io/controller-runtime; version v0.16.3 -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -128,6 +194,12 @@ https://github.com/kubernetes-sigs/json ** sigs.k8s.io/structured-merge-diff/v4; version v4.2.3 -- https://github.com/kubernetes-sigs/structured-merge-diff +** sigs.k8s.io/yaml; version v1.4.0 -- +https://github.com/kubernetes-sigs/yaml + +** sigs.k8s.io/yaml/goyaml.v2; version v1.4.0 -- +https://github.com/kubernetes-sigs/yaml + Apache License Version 2.0, January 2004 @@ -332,6 +404,22 @@ https://github.com/kubernetes-sigs/structured-merge-diff limitations under the License. +* For github.com/coreos/go-semver/semver see also this required NOTICE: +CoreOS Project +Copyright 2018 CoreOS, Inc + +This product includes software developed at CoreOS, Inc. +(http://www.coreos.com/). + + +* For github.com/coreos/go-systemd/v22 see also this required NOTICE: +CoreOS Project +Copyright 2018 CoreOS, Inc + +This product includes software developed at CoreOS, Inc. +(http://www.coreos.com/). + + * For github.com/matttproud/golang_protobuf_extensions/pbutil see also this required NOTICE: Copyright 2012 Matt T. Proud (matt.proud@gmail.com) @@ -411,6 +499,22 @@ 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. + +* For sigs.k8s.io/yaml/goyaml.v2 see also this required NOTICE: +Copyright 2011-2016 Canonical Ltd. + +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. + ------ ** github.com/pkg/errors; version v0.9.1 -- @@ -472,10 +576,42 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ +** github.com/antlr/antlr4/runtime/Go/antlr/v4; version v4.0.0-20230305170008-8188dc5388df -- +https://github.com/antlr/antlr4/runtime/Go/antlr/v4 + +Copyright 2021 The ANTLR Project + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/evanphx/json-patch; version v5.6.0+incompatible -- https://github.com/evanphx/json-patch -** github.com/evanphx/json-patch/v5; version v5.6.0 -- +** github.com/evanphx/json-patch/v5; version v5.7.0 -- https://github.com/evanphx/json-patch/v5 Copyright (c) 2014, Evan Phoenix @@ -645,7 +781,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/google/uuid; version v1.4.0 -- +** github.com/google/uuid; version v1.5.0 -- https://github.com/google/uuid Copyright (c) 2009,2014 Google Inc. All rights reserved. @@ -678,6 +814,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.16.0 -- +https://github.com/grpc-ecosystem/grpc-gateway/v2 + +Copyright (c) 2015, Gengo, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name of Gengo, Inc. nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------ + ** github.com/imdario/mergo; version v0.3.13 -- https://github.com/darccio/mergo @@ -749,7 +918,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.42.0 -- +** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.44.0 -- https://github.com/prometheus/common Copyright (c) 2011, Open Knowledge Foundation Ltd. @@ -819,28 +988,34 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/vmware/govmomi/vim25/json; version v0.34.0 -- +** github.com/vmware/govmomi/vim25/json; version v0.34.2 -- https://github.com/vmware/govmomi -** github.com/vmware/govmomi/vim25/xml; version v0.34.0 -- +** github.com/vmware/govmomi/vim25/xml; version v0.34.2 -- https://github.com/vmware/govmomi -** golang.org/go; version go1.20.14 -- +** golang.org/go; version go1.21.8 -- https://github.com/golang/go +** golang.org/x/crypto; version v0.21.0 -- +https://golang.org/x/crypto + ** golang.org/x/exp; version v0.0.0-20230905200255-921286631fa9 -- https://golang.org/x/exp -** golang.org/x/net; version v0.19.0 -- +** golang.org/x/net; version v0.23.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.10.0 -- +** golang.org/x/oauth2; version v0.14.0 -- https://golang.org/x/oauth2 -** golang.org/x/sys/unix; version v0.15.0 -- +** golang.org/x/sync/singleflight; version v0.6.0 -- +https://golang.org/x/sync + +** golang.org/x/sys/unix; version v0.18.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.15.0 -- +** golang.org/x/term; version v0.18.0 -- https://golang.org/x/term ** golang.org/x/text; version v0.14.0 -- @@ -849,7 +1024,7 @@ https://golang.org/x/text ** golang.org/x/time/rate; version v0.3.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.27.4 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.28.5 -- https://github.com/kubernetes/apimachinery Copyright (c) 2009 The Go Authors. All rights reserved. @@ -882,7 +1057,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.31.0 -- +** google.golang.org/protobuf; version v1.33.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -986,7 +1161,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20230501164219-8b0f38b5fd1f -- +** k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json; version v0.0.0-20230717233707-2695361300d9 -- https://github.com/kubernetes/kube-openapi Copyright (c) 2020 The Go Authors. All rights reserved. @@ -1019,7 +1194,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20230209194617-a36077c30491 -- +** k8s.io/utils/internal/third_party/forked/golang; version v0.0.0-20231127182322-b307cd553661 -- https://github.com/kubernetes/utils Copyright (c) 2012 The Go Authors. All rights reserved. @@ -1052,7 +1227,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/davecgh/go-spew/spew; version v1.1.1 -- +** github.com/davecgh/go-spew/spew; version v1.1.2-0.20180830191138-d8f796af33cc -- https://github.com/davecgh/go-spew ISC License @@ -1073,6 +1248,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ------ +** github.com/asaskevich/govalidator; version v0.0.0-20230301143203-a9d515a09cc2 -- +https://github.com/asaskevich/govalidator +Copyright (c) 2014-2020 Alex Saskevich + ** github.com/beorn7/perks/quantile; version v1.0.1 -- https://github.com/beorn7/perks Copyright (C) 2013 Blake Mizerany @@ -1085,14 +1264,22 @@ Copyright (c) 2014 Benedikt Lang https://github.com/blang/semver/v4 Copyright (c) 2014 Benedikt Lang +** github.com/cenkalti/backoff/v4; version v4.2.1 -- +https://github.com/cenkalti/backoff/v4 +Copyright (c) 2014 Cenk Altı + ** github.com/cespare/xxhash/v2; version v2.2.0 -- https://github.com/cespare/xxhash/v2 Copyright (c) 2016 Caleb Spare -** github.com/emicklei/go-restful/v3; version v3.10.2 -- +** github.com/emicklei/go-restful/v3; version v3.11.0 -- https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei +** github.com/felixge/httpsnoop; version v1.0.4 -- +https://github.com/felixge/httpsnoop +Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com) + ** github.com/gobuffalo/flect; version v1.0.2 -- https://github.com/gobuffalo/flect Copyright (c) 2019 Mark Bates @@ -1109,40 +1296,43 @@ Copyright (c) 2016 json-iterator https://github.com/mailru/easyjson Copyright (c) 2016 Mail.Ru Group -** github.com/onsi/gomega; version v1.27.10 -- +** github.com/onsi/gomega; version v1.30.0 -- https://github.com/onsi/gomega Copyright (c) 2013-2014 Onsi Fakhouri -** go.uber.org/atomic; version v1.10.0 -- -https://github.com/uber-go/atomic -Copyright (c) 2016 Uber Technologies, Inc. +** github.com/stoewer/go-strcase; version v1.2.0 -- +https://github.com/stoewer/go-strcase +Copyright (c) 2017, Adrian Stoewer -** go.uber.org/multierr; version v1.8.0 -- +** go.uber.org/multierr; version v1.11.0 -- https://github.com/uber-go/multierr Copyright (c) 2017-2021 Uber Technologies, Inc. -** go.uber.org/zap; version v1.24.0 -- +** go.uber.org/zap; version v1.25.0 -- https://github.com/uber-go/zap Copyright (c) 2016-2017 Uber Technologies, Inc. -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +** gopkg.in/natefinch/lumberjack.v2; version v2.2.1 -- +https://gopkg.in/natefinch/lumberjack.v2 +Copyright (c) 2014 Nate Finch + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. ------ ** gopkg.in/yaml.v3; version v3.0.1 -- @@ -1217,419 +1407,3 @@ See the License for the specific language governing permissions and limitations under the License. ------ - -** sigs.k8s.io/yaml; version v1.3.0 -- -https://github.com/kubernetes-sigs/yaml -Copyright (c) 2014 Sam Ghods -Copyright (c) 2012 The Go Authors. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - - - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. -* Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------- - -** github.com/hashicorp/go-version; version v1.3.0 -- -https://github.com/hashicorp/go-version - - * Package github.com/hashicorp/go-version's source code may be found at: - https://github.com/hashicorp/go-version/tree/v1.3.0 - -Mozilla Public License, version 2.0 - -1. Definitions - -1.1. “Contributor” - - means each individual or legal entity that creates, contributes to the - creation of, or owns Covered Software. - -1.2. “Contributor Version” - - means the combination of the Contributions of others (if any) used by a - Contributor and that particular Contributor’s Contribution. - -1.3. “Contribution” - - means Covered Software of a particular Contributor. - -1.4. “Covered Software” - - means Source Code Form to which the initial Contributor has attached the - notice in Exhibit A, the Executable Form of such Source Code Form, and - Modifications of such Source Code Form, in each case including portions - thereof. - -1.5. “Incompatible With Secondary Licenses” - means - - a. that the initial Contributor has attached the notice described in - Exhibit B to the Covered Software; or - - b. that the Covered Software was made available under the terms of version - 1.1 or earlier of the License, but not also under the terms of a - Secondary License. - -1.6. “Executable Form” - - means any form of the work other than Source Code Form. - -1.7. “Larger Work” - - means a work that combines Covered Software with other material, in a separate - file or files, that is not Covered Software. - -1.8. “License” - - means this document. - -1.9. “Licensable” - - means having the right to grant, to the maximum extent possible, whether at the - time of the initial grant or subsequently, any and all of the rights conveyed by - this License. - -1.10. “Modifications” - - means any of the following: - - a. any file in Source Code Form that results from an addition to, deletion - from, or modification of the contents of Covered Software; or - - b. any new file in Source Code Form that contains any Covered Software. - -1.11. “Patent Claims” of a Contributor - - means any patent claim(s), including without limitation, method, process, - and apparatus claims, in any patent Licensable by such Contributor that - would be infringed, but for the grant of the License, by the making, - using, selling, offering for sale, having made, import, or transfer of - either its Contributions or its Contributor Version. - -1.12. “Secondary License” - - means either the GNU General Public License, Version 2.0, the GNU Lesser - General Public License, Version 2.1, the GNU Affero General Public - License, Version 3.0, or any later versions of those licenses. - -1.13. “Source Code Form” - - means the form of the work preferred for making modifications. - -1.14. “You” (or “Your”) - - means an individual or a legal entity exercising rights under this - License. For legal entities, “You” includes any entity that controls, is - controlled by, or is under common control with You. For purposes of this - definition, “control” means (a) the power, direct or indirect, to cause - the direction or management of such entity, whether by contract or - otherwise, or (b) ownership of more than fifty percent (50%) of the - outstanding shares or beneficial ownership of such entity. - - -2. License Grants and Conditions - -2.1. Grants - - Each Contributor hereby grants You a world-wide, royalty-free, - non-exclusive license: - - a. under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or as - part of a Larger Work; and - - b. under Patent Claims of such Contributor to make, use, sell, offer for - sale, have made, import, and otherwise transfer either its Contributions - or its Contributor Version. - -2.2. Effective Date - - The licenses granted in Section 2.1 with respect to any Contribution become - effective for each Contribution on the date the Contributor first distributes - such Contribution. - -2.3. Limitations on Grant Scope - - The licenses granted in this Section 2 are the only rights granted under this - License. No additional rights or licenses will be implied from the distribution - or licensing of Covered Software under this License. Notwithstanding Section - 2.1(b) above, no patent license is granted by a Contributor: - - a. for any code that a Contributor has removed from Covered Software; or - - b. for infringements caused by: (i) Your and any other third party’s - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - - c. under Patent Claims infringed by Covered Software in the absence of its - Contributions. - - This License does not grant any rights in the trademarks, service marks, or - logos of any Contributor (except as may be necessary to comply with the - notice requirements in Section 3.4). - -2.4. Subsequent Licenses - - No Contributor makes additional grants as a result of Your choice to - distribute the Covered Software under a subsequent version of this License - (see Section 10.2) or under the terms of a Secondary License (if permitted - under the terms of Section 3.3). - -2.5. Representation - - Each Contributor represents that the Contributor believes its Contributions - are its original creation(s) or it has sufficient rights to grant the - rights to its Contributions conveyed by this License. - -2.6. Fair Use - - This License is not intended to limit any rights You have under applicable - copyright doctrines of fair use, fair dealing, or other equivalents. - -2.7. Conditions - - Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in - Section 2.1. - - -3. Responsibilities - -3.1. Distribution of Source Form - - All distribution of Covered Software in Source Code Form, including any - Modifications that You create or to which You contribute, must be under the - terms of this License. You must inform recipients that the Source Code Form - of the Covered Software is governed by the terms of this License, and how - they can obtain a copy of this License. You may not attempt to alter or - restrict the recipients’ rights in the Source Code Form. - -3.2. Distribution of Executable Form - - If You distribute Covered Software in Executable Form then: - - a. such Covered Software must also be made available in Source Code Form, - as described in Section 3.1, and You must inform recipients of the - Executable Form how they can obtain a copy of such Source Code Form by - reasonable means in a timely manner, at a charge no more than the cost - of distribution to the recipient; and - - b. You may distribute such Executable Form under the terms of this License, - or sublicense it under different terms, provided that the license for - the Executable Form does not attempt to limit or alter the recipients’ - rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - - You may create and distribute a Larger Work under terms of Your choice, - provided that You also comply with the requirements of this License for the - Covered Software. If the Larger Work is a combination of Covered Software - with a work governed by one or more Secondary Licenses, and the Covered - Software is not Incompatible With Secondary Licenses, this License permits - You to additionally distribute such Covered Software under the terms of - such Secondary License(s), so that the recipient of the Larger Work may, at - their option, further distribute the Covered Software under the terms of - either this License or such Secondary License(s). - -3.4. Notices - - You may not remove or alter the substance of any license notices (including - copyright notices, patent notices, disclaimers of warranty, or limitations - of liability) contained within the Source Code Form of the Covered - Software, except that You may alter any license notices to the extent - required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - - You may choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of Covered - Software. However, You may do so only on Your own behalf, and not on behalf - of any Contributor. You must make it absolutely clear that any such - warranty, support, indemnity, or liability obligation is offered by You - alone, and You hereby agree to indemnify every Contributor for any - liability incurred by such Contributor as a result of warranty, support, - indemnity or liability terms You offer. You may include additional - disclaimers of warranty and limitations of liability specific to any - jurisdiction. - -4. Inability to Comply Due to Statute or Regulation - - If it is impossible for You to comply with any of the terms of this License - with respect to some or all of the Covered Software due to statute, judicial - order, or regulation then You must: (a) comply with the terms of this License - to the maximum extent possible; and (b) describe the limitations and the code - they affect. Such description must be placed in a text file included with all - distributions of the Covered Software under this License. Except to the - extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to - understand it. - -5. Termination - -5.1. The rights granted under this License will terminate automatically if You - fail to comply with any of its terms. However, if You become compliant, - then the rights granted under this License from a particular Contributor - are reinstated (a) provisionally, unless and until such Contributor - explicitly and finally terminates Your grants, and (b) on an ongoing basis, - if such Contributor fails to notify You of the non-compliance by some - reasonable means prior to 60 days after You have come back into compliance. - Moreover, Your grants from a particular Contributor are reinstated on an - ongoing basis if such Contributor notifies You of the non-compliance by - some reasonable means, this is the first time You have received notice of - non-compliance with this License from such Contributor, and You become - compliant prior to 30 days after Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent - infringement claim (excluding declaratory judgment actions, counter-claims, - and cross-claims) alleging that a Contributor Version directly or - indirectly infringes any patent, then the rights granted to You by any and - all Contributors for the Covered Software under Section 2.1 of this License - shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user - license agreements (excluding distributors and resellers) which have been - validly granted by You or Your distributors under this License prior to - termination shall survive termination. - -6. Disclaimer of Warranty - - Covered Software is provided under this License on an “as is” basis, without - warranty of any kind, either expressed, implied, or statutory, including, - without limitation, warranties that the Covered Software is free of defects, - merchantable, fit for a particular purpose or non-infringing. The entire - risk as to the quality and performance of the Covered Software is with You. - Should any Covered Software prove defective in any respect, You (not any - Contributor) assume the cost of any necessary servicing, repair, or - correction. This disclaimer of warranty constitutes an essential part of this - License. No use of any Covered Software is authorized under this License - except under this disclaimer. - -7. Limitation of Liability - - Under no circumstances and under no legal theory, whether tort (including - negligence), contract, or otherwise, shall any Contributor, or anyone who - distributes Covered Software as permitted above, be liable to You for any - direct, indirect, special, incidental, or consequential damages of any - character including, without limitation, damages for lost profits, loss of - goodwill, work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses, even if such party shall have been - informed of the possibility of such damages. This limitation of liability - shall not apply to liability for death or personal injury resulting from such - party’s negligence to the extent applicable law prohibits such limitation. - Some jurisdictions do not allow the exclusion or limitation of incidental or - consequential damages, so this exclusion and limitation may not apply to You. - -8. Litigation - - Any litigation relating to this License may be brought only in the courts of - a jurisdiction where the defendant maintains its principal place of business - and such litigation shall be governed by laws of that jurisdiction, without - reference to its conflict-of-law provisions. Nothing in this Section shall - prevent a party’s ability to bring cross-claims or counter-claims. - -9. Miscellaneous - - This License represents the complete agreement concerning the subject matter - hereof. If any provision of this License is held to be unenforceable, such - provision shall be reformed only to the extent necessary to make it - enforceable. Any law or regulation which provides that the language of a - contract shall be construed against the drafter shall not be used to construe - this License against a Contributor. - - -10. Versions of the License - -10.1. New Versions - - Mozilla Foundation is the license steward. Except as provided in Section - 10.3, no one other than the license steward has the right to modify or - publish new versions of this License. Each version will be given a - distinguishing version number. - -10.2. Effect of New Versions - - You may distribute the Covered Software under the terms of the version of - the License under which You originally received the Covered Software, or - under the terms of any subsequent version published by the license - steward. - -10.3. Modified Versions - - If you create software not governed by this License, and you want to - create a new license for such software, you may create and use a modified - version of this License if you rename the license and remove any - references to the name of the license steward (except to note that such - modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses - If You choose to distribute Source Code Form that is Incompatible With - Secondary Licenses under the terms of this version of the License, the - notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice - - This Source Code Form is subject to the - terms of the Mozilla Public License, v. - 2.0. If a copy of the MPL was not - distributed with this file, You can - obtain one at - http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular file, then -You may include the notice in a location (such as a LICENSE file in a relevant -directory) where a recipient would be likely to look for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - “Incompatible With Secondary Licenses” Notice - - This Source Code Form is “Incompatible - With Secondary Licenses”, as defined by - the Mozilla Public License, v. 2.0. - - ------- diff --git a/projects/kubernetes-sigs/cluster-api-provider-vsphere/CHECKSUMS b/projects/kubernetes-sigs/cluster-api-provider-vsphere/CHECKSUMS index 386b5f780e..f271bac95f 100644 --- a/projects/kubernetes-sigs/cluster-api-provider-vsphere/CHECKSUMS +++ b/projects/kubernetes-sigs/cluster-api-provider-vsphere/CHECKSUMS @@ -1,2 +1,2 @@ -cfb5ea5dc40ccb87612541627ab192fb239b69f099fa5ded2d1b780216984a27 _output/bin/cluster-api-provider-vsphere/linux-amd64/manager -936484c912506d8150ed96114299f8cf95aeee1aedc76327a76e7b092c7edc34 _output/bin/cluster-api-provider-vsphere/linux-arm64/manager +bd4968bd2ef8024ccd0b1d33b6ead2957ac5e0cadfd1c3cd68c05ab959edc855 _output/bin/cluster-api-provider-vsphere/linux-amd64/manager +a56eff4b12fe6bd5139378877591084e0ffba4a9eb6ff5c1591aa9c6f11d6f9c _output/bin/cluster-api-provider-vsphere/linux-arm64/manager diff --git a/projects/kubernetes-sigs/cluster-api-provider-vsphere/GIT_TAG b/projects/kubernetes-sigs/cluster-api-provider-vsphere/GIT_TAG index bb667f9c3e..7517f68769 100644 --- a/projects/kubernetes-sigs/cluster-api-provider-vsphere/GIT_TAG +++ b/projects/kubernetes-sigs/cluster-api-provider-vsphere/GIT_TAG @@ -1 +1 @@ -v1.8.5 +v1.9.3 diff --git a/projects/kubernetes-sigs/cluster-api-provider-vsphere/GOLANG_VERSION b/projects/kubernetes-sigs/cluster-api-provider-vsphere/GOLANG_VERSION index 5fb5a6b4f5..d2ab029d32 100644 --- a/projects/kubernetes-sigs/cluster-api-provider-vsphere/GOLANG_VERSION +++ b/projects/kubernetes-sigs/cluster-api-provider-vsphere/GOLANG_VERSION @@ -1 +1 @@ -1.20 +1.21 diff --git a/projects/kubernetes-sigs/cluster-api-provider-vsphere/patches/0001-Add-capv-support-for-Bottlerocket.patch b/projects/kubernetes-sigs/cluster-api-provider-vsphere/patches/0001-Add-capv-support-for-Bottlerocket.patch index d735a8192b..efdce38279 100644 --- a/projects/kubernetes-sigs/cluster-api-provider-vsphere/patches/0001-Add-capv-support-for-Bottlerocket.patch +++ b/projects/kubernetes-sigs/cluster-api-provider-vsphere/patches/0001-Add-capv-support-for-Bottlerocket.patch @@ -1,19 +1,20 @@ -From 02c21a83629c62c4526fcccf62bfb91865f493bc Mon Sep 17 00:00:00 2001 -From: Taylor Neyland -Date: Tue, 6 Jun 2023 16:56:24 -0500 +From 1e29e2d8cdfa19b92abc9cb479523f37da360689 Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Mon, 15 Apr 2024 22:40:08 +0000 Subject: [PATCH] Add capv support for Bottlerocket +Signed-off-by: Prow Bot --- pkg/services/govmomi/vcenter/clone.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/govmomi/vcenter/clone.go b/pkg/services/govmomi/vcenter/clone.go -index c6d1e1d1..01a4fd86 100644 +index e2167900..6a5fe3ab 100644 --- a/pkg/services/govmomi/vcenter/clone.go +++ b/pkg/services/govmomi/vcenter/clone.go -@@ -60,10 +60,10 @@ func Clone(ctx *context.VMContext, bootstrapData []byte, format bootstrapv1.Form +@@ -62,10 +62,10 @@ func Clone(ctx context.Context, vmCtx *capvcontext.VMContext, bootstrapData []by if len(bootstrapData) > 0 { - ctx.Logger.Info("applied bootstrap data to VM clone spec") + log.Info("Applied bootstrap data to VM clone spec") switch format { - case bootstrapv1.CloudConfig: - extraConfig.SetCloudInitUserData(bootstrapData) @@ -23,7 +24,7 @@ index c6d1e1d1..01a4fd86 100644 + extraConfig.SetCloudInitUserData(bootstrapData) } } - if ctx.VSphereVM.Spec.CustomVMXKeys != nil { + if vmCtx.VSphereVM.Spec.CustomVMXKeys != nil { -- 2.40.1