Update dependencies for k8s v1.29.0
This commit is contained in:
@@ -77,7 +77,7 @@ func genStatus(t *types.Type) bool {
|
||||
// hasObjectMeta returns true if the type has a ObjectMeta field.
|
||||
func hasObjectMeta(t *types.Type) bool {
|
||||
for _, m := range t.Members {
|
||||
if m.Embedded == true && m.Name == "ObjectMeta" {
|
||||
if m.Embedded && m.Name == "ObjectMeta" {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
12
client/vendor/k8s.io/code-generator/cmd/informer-gen/generators/factory.go
generated
vendored
12
client/vendor/k8s.io/code-generator/cmd/informer-gen/generators/factory.go
generated
vendored
@@ -75,6 +75,7 @@ func (g *factoryGenerator) GenerateType(c *generator.Context, t *types.Type, w i
|
||||
}
|
||||
m := map[string]interface{}{
|
||||
"cacheSharedIndexInformer": c.Universe.Type(cacheSharedIndexInformer),
|
||||
"cacheTransformFunc": c.Universe.Type(cacheTransformFunc),
|
||||
"groupVersions": g.groupVersions,
|
||||
"gvInterfaces": gvInterfaces,
|
||||
"gvNewFuncs": gvNewFuncs,
|
||||
@@ -109,6 +110,7 @@ type sharedInformerFactory struct {
|
||||
lock {{.syncMutex|raw}}
|
||||
defaultResync {{.timeDuration|raw}}
|
||||
customResync map[{{.reflectType|raw}}]{{.timeDuration|raw}}
|
||||
transform {{.cacheTransformFunc|raw}}
|
||||
|
||||
informers map[{{.reflectType|raw}}]{{.cacheSharedIndexInformer|raw}}
|
||||
// startedInformers is used for tracking which informers have been started.
|
||||
@@ -147,6 +149,14 @@ func WithNamespace(namespace string) SharedInformerOption {
|
||||
}
|
||||
}
|
||||
|
||||
// WithTransform sets a transform on all informers.
|
||||
func WithTransform(transform {{.cacheTransformFunc|raw}}) SharedInformerOption {
|
||||
return func(factory *sharedInformerFactory) *sharedInformerFactory {
|
||||
factory.transform = transform
|
||||
return factory
|
||||
}
|
||||
}
|
||||
|
||||
// NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces.
|
||||
func NewSharedInformerFactory(client {{.clientSetInterface|raw}}, defaultResync {{.timeDuration|raw}}) SharedInformerFactory {
|
||||
return NewSharedInformerFactoryWithOptions(client, defaultResync)
|
||||
@@ -252,11 +262,11 @@ func (f *sharedInformerFactory) InformerFor(obj {{.runtimeObject|raw}}, newFunc
|
||||
}
|
||||
|
||||
informer = newFunc(f.client, resyncPeriod)
|
||||
informer.SetTransform(f.transform)
|
||||
f.informers[informerType] = informer
|
||||
|
||||
return informer
|
||||
}
|
||||
|
||||
`
|
||||
|
||||
var sharedInformerFactoryInterface = `
|
||||
|
1
client/vendor/k8s.io/code-generator/cmd/informer-gen/generators/types.go
generated
vendored
1
client/vendor/k8s.io/code-generator/cmd/informer-gen/generators/types.go
generated
vendored
@@ -28,6 +28,7 @@ var (
|
||||
cacheNewGenericLister = types.Name{Package: "k8s.io/client-go/tools/cache", Name: "NewGenericLister"}
|
||||
cacheNewSharedIndexInformer = types.Name{Package: "k8s.io/client-go/tools/cache", Name: "NewSharedIndexInformer"}
|
||||
cacheSharedIndexInformer = types.Name{Package: "k8s.io/client-go/tools/cache", Name: "SharedIndexInformer"}
|
||||
cacheTransformFunc = types.Name{Package: "k8s.io/client-go/tools/cache", Name: "TransformFunc"}
|
||||
listOptions = types.Name{Package: "k8s.io/kubernetes/pkg/apis/core", Name: "ListOptions"}
|
||||
reflectType = types.Name{Package: "reflect", Name: "Type"}
|
||||
runtimeObject = types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "Object"}
|
||||
|
2
client/vendor/k8s.io/code-generator/cmd/register-gen/generators/packages.go
generated
vendored
2
client/vendor/k8s.io/code-generator/cmd/register-gen/generators/packages.go
generated
vendored
@@ -93,7 +93,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
|
||||
for _, t := range pkg.Types {
|
||||
klog.V(5).Infof("considering type = %s", t.Name.String())
|
||||
for _, typeMember := range t.Members {
|
||||
if typeMember.Name == "TypeMeta" && typeMember.Embedded == true {
|
||||
if typeMember.Name == "TypeMeta" && typeMember.Embedded {
|
||||
typesToRegister = append(typesToRegister, t)
|
||||
}
|
||||
}
|
||||
|
6
client/vendor/k8s.io/code-generator/generate-internal-groups.sh
generated
vendored
6
client/vendor/k8s.io/code-generator/generate-internal-groups.sh
generated
vendored
@@ -120,6 +120,9 @@ for GVs in ${GROUPS_WITH_VERSIONS}; do
|
||||
done
|
||||
done
|
||||
|
||||
CLIENTSET_PKG="${CLIENTSET_PKG_NAME:-clientset}"
|
||||
CLIENTSET_NAME="${CLIENTSET_NAME_VERSIONED:-versioned}"
|
||||
|
||||
if grep -qw "deepcopy" <<<"${GENS}"; then
|
||||
# Nuke existing files
|
||||
for dir in $(GO111MODULE=on go list -f '{{.Dir}}' "${ALL_FQ_APIS[@]}"); do
|
||||
@@ -187,9 +190,6 @@ if grep -qw "applyconfiguration" <<<"${GENS}"; then
|
||||
fi
|
||||
|
||||
if grep -qw "client" <<<"${GENS}"; then
|
||||
CLIENTSET_PKG="${CLIENTSET_PKG_NAME:-clientset}"
|
||||
CLIENTSET_NAME="${CLIENTSET_NAME_VERSIONED:-versioned}"
|
||||
|
||||
# Nuke existing files
|
||||
root="$(GO111MODULE=on go list -f '{{.Dir}}' "${OUTPUT_PKG}/${CLIENTSET_PKG}/${CLIENTSET_NAME}" 2>/dev/null || true)"
|
||||
if [ -n "${root}" ]; then
|
||||
|
32
client/vendor/k8s.io/code-generator/kube_codegen.sh
generated
vendored
32
client/vendor/k8s.io/code-generator/kube_codegen.sh
generated
vendored
@@ -50,11 +50,16 @@ function kube::codegen::internal::git_grep() {
|
||||
# --boilerplate <string = path_to_kube_codegen_boilerplate>
|
||||
# An optional override for the header file to insert into generated files.
|
||||
#
|
||||
# --extra-peer-dir <string>
|
||||
# An optional list (this flag may be specified multiple times) of "extra"
|
||||
# directories to consider during conversion generation.
|
||||
#
|
||||
function kube::codegen::gen_helpers() {
|
||||
local in_pkg_root=""
|
||||
local out_base="" # gengo needs the output dir must be $out_base/$out_pkg_root
|
||||
local boilerplate="${KUBE_CODEGEN_ROOT}/hack/boilerplate.go.txt"
|
||||
local v="${KUBE_VERBOSE:-0}"
|
||||
local extra_peers=()
|
||||
|
||||
while [ "$#" -gt 0 ]; do
|
||||
case "$1" in
|
||||
@@ -70,6 +75,10 @@ function kube::codegen::gen_helpers() {
|
||||
boilerplate="$2"
|
||||
shift 2
|
||||
;;
|
||||
"--extra-peer-dir")
|
||||
extra_peers+=("$2")
|
||||
shift 2
|
||||
;;
|
||||
*)
|
||||
echo "unknown argument: $1" >&2
|
||||
return 1
|
||||
@@ -128,16 +137,16 @@ function kube::codegen::gen_helpers() {
|
||||
":(glob)${root}"/'**/zz_generated.deepcopy.go' \
|
||||
| xargs -0 rm -f
|
||||
|
||||
local inputs=()
|
||||
local input_args=()
|
||||
for arg in "${input_pkgs[@]}"; do
|
||||
inputs+=("--input-dirs" "$arg")
|
||||
input_args+=("--input-dirs" "$arg")
|
||||
done
|
||||
"${gobin}/deepcopy-gen" \
|
||||
-v "${v}" \
|
||||
-O zz_generated.deepcopy \
|
||||
--go-header-file "${boilerplate}" \
|
||||
--output-base "${out_base}" \
|
||||
"${inputs[@]}"
|
||||
"${input_args[@]}"
|
||||
fi
|
||||
|
||||
# Defaults
|
||||
@@ -162,16 +171,16 @@ function kube::codegen::gen_helpers() {
|
||||
":(glob)${root}"/'**/zz_generated.defaults.go' \
|
||||
| xargs -0 rm -f
|
||||
|
||||
local inputs=()
|
||||
local input_args=()
|
||||
for arg in "${input_pkgs[@]}"; do
|
||||
inputs+=("--input-dirs" "$arg")
|
||||
input_args+=("--input-dirs" "$arg")
|
||||
done
|
||||
"${gobin}/defaulter-gen" \
|
||||
-v "${v}" \
|
||||
-O zz_generated.defaults \
|
||||
--go-header-file "${boilerplate}" \
|
||||
--output-base "${out_base}" \
|
||||
"${inputs[@]}"
|
||||
"${input_args[@]}"
|
||||
fi
|
||||
|
||||
# Conversions
|
||||
@@ -196,16 +205,21 @@ function kube::codegen::gen_helpers() {
|
||||
":(glob)${root}"/'**/zz_generated.conversion.go' \
|
||||
| xargs -0 rm -f
|
||||
|
||||
local inputs=()
|
||||
local input_args=()
|
||||
for arg in "${input_pkgs[@]}"; do
|
||||
inputs+=("--input-dirs" "$arg")
|
||||
input_args+=("--input-dirs" "$arg")
|
||||
done
|
||||
local extra_peer_args=()
|
||||
for arg in "${extra_peers[@]:+"${extra_peers[@]}"}"; do
|
||||
extra_peer_args+=("--extra-peer-dirs" "$arg")
|
||||
done
|
||||
"${gobin}/conversion-gen" \
|
||||
-v "${v}" \
|
||||
-O zz_generated.conversion \
|
||||
--go-header-file "${boilerplate}" \
|
||||
--output-base "${out_base}" \
|
||||
"${inputs[@]}"
|
||||
"${extra_peer_args[@]:+"${extra_peer_args[@]}"}" \
|
||||
"${input_args[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user