Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

🌱 update dependencies #250

Merged
merged 1 commit into from
May 22, 2024
Merged

🌱 update dependencies #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ARCH ?= $(shell go env GOARCH)
ALL_ARCH ?= amd64 arm64

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.26
ENVTEST_K8S_VERSION = 1.29

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -79,9 +79,10 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
.PHONY: generate
generate: controller-gen conversion-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
$(CONVERSION_GEN) --input-dirs=./api/v1alpha1 \
--output-file-base=zz_generated.conversion $(OUTPUT_BASE) \
--go-header-file=./hack/boilerplate.go.txt
$(CONVERSION_GEN) \
--output-file=zz_generated.conversion.go \
--go-header-file=./hack/boilerplate.go.txt \
./api/v1alpha1

.PHONY: fmt
fmt: ## Run go fmt against code.
Expand Down Expand Up @@ -223,7 +224,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
CONTROLLER_GEN = $(HACK_BIN)/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
env GOBIN=$(HACK_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0
env GOBIN=$(HACK_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0

KUSTOMIZE = $(HACK_BIN)/kustomize
.PHONY: kustomize
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion api/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

148 changes: 84 additions & 64 deletions config/crd/bases/ipam.cluster.x-k8s.io_globalinclusterippools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: globalinclusterippools.ipam.cluster.x-k8s.io
spec:
group: ipam.cluster.x-k8s.io
Expand Down Expand Up @@ -47,52 +45,63 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: GlobalInClusterIPPool is the Schema for the global inclusterippools
API. This pool type is cluster scoped. IPAddressClaims can reference pools
of this type from any any namespace.
description: |-
GlobalInClusterIPPool is the Schema for the global inclusterippools API.
This pool type is cluster scoped. IPAddressClaims can reference
pools of this type from any any namespace.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
properties:
addresses:
description: Addresses is a list of IP addresses that can be assigned.
This set of addresses can be non-contiguous. Can be omitted if subnet,
or first and last is set.
description: |-
Addresses is a list of IP addresses that can be assigned. This set of
addresses can be non-contiguous. Can be omitted if subnet, or first and
last is set.
items:
type: string
type: array
end:
description: Last is the last address that can be assigned. Must come
after first and needs to fit into a common subnet. If unset, the
second last address of subnet will be used.
description: |-
Last is the last address that can be assigned.
Must come after first and needs to fit into a common subnet.
If unset, the second last address of subnet will be used.
type: string
gateway:
description: Gateway
type: string
prefix:
description: Prefix is the network prefix to use. If unset the prefix
from the subnet will be used.
description: |-
Prefix is the network prefix to use.
If unset the prefix from the subnet will be used.
maximum: 128
type: integer
start:
description: First is the first address that can be assigned. If unset,
the second address of subnet will be used.
description: |-
First is the first address that can be assigned.
If unset, the second address of subnet will be used.
type: string
subnet:
description: Subnet is the subnet to assign IP addresses from. Can
be omitted if addresses or first, last and prefix are set.
description: |-
Subnet is the subnet to assign IP addresses from.
Can be omitted if addresses or first, last and prefix are set.
type: string
type: object
status:
Expand All @@ -103,21 +112,25 @@ spec:
IPs in the pool.
properties:
free:
description: Free is the count of unallocated IPs in the pool.
description: |-
Free is the count of unallocated IPs in the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
outOfRange:
description: Out of Range is the count of allocated IPs in the
pool that is not contained within spec.Addresses. Counts greater
than int can contain will report as math.MaxInt.
description: |-
Out of Range is the count of allocated IPs in the pool that is not
contained within spec.Addresses.
Counts greater than int can contain will report as math.MaxInt.
type: integer
total:
description: Total is the total number of IPs configured for the
pool. Counts greater than int can contain will report as math.MaxInt.
description: |-
Total is the total number of IPs configured for the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
used:
description: Used is the count of allocated IPs in the pool. Counts
greater than int can contain will report as math.MaxInt.
description: |-
Used is the count of allocated IPs in the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
required:
- free
Expand Down Expand Up @@ -151,41 +164,50 @@ spec:
name: v1alpha2
schema:
openAPIV3Schema:
description: GlobalInClusterIPPool is the Schema for the global inclusterippools
API. This pool type is cluster scoped. IPAddressClaims can reference pools
of this type from any any namespace.
description: |-
GlobalInClusterIPPool is the Schema for the global inclusterippools API.
This pool type is cluster scoped. IPAddressClaims can reference
pools of this type from any any namespace.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
properties:
addresses:
description: Addresses is a list of IP addresses that can be assigned.
This set of addresses can be non-contiguous.
description: |-
Addresses is a list of IP addresses that can be assigned. This set of
addresses can be non-contiguous.
items:
type: string
type: array
allocateReservedIPAddresses:
description: AllocateReservedIPAddresses causes the provider to allocate
the network address (the first address in the inferred subnet) and
broadcast address (the last address in the inferred subnet) when
IPv4. The provider will allocate the anycast address address (the
first address in the inferred subnet) when IPv6.
description: |-
AllocateReservedIPAddresses causes the provider to allocate the network
address (the first address in the inferred subnet) and broadcast address
(the last address in the inferred subnet) when IPv4. The provider will
allocate the anycast address address (the first address in the inferred
subnet) when IPv6.
type: boolean
excludedAddresses:
description: ExcludedAddresses is a list of IP addresses, which will
be excluded from the set of assignable IP addresses.
description: |-
ExcludedAddresses is a list of IP addresses, which will be excluded from
the set of assignable IP addresses.
items:
type: string
type: array
Expand All @@ -208,21 +230,25 @@ spec:
IPs in the pool.
properties:
free:
description: Free is the count of unallocated IPs in the pool.
description: |-
Free is the count of unallocated IPs in the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
outOfRange:
description: Out of Range is the count of allocated IPs in the
pool that is not contained within spec.Addresses. Counts greater
than int can contain will report as math.MaxInt.
description: |-
Out of Range is the count of allocated IPs in the pool that is not
contained within spec.Addresses.
Counts greater than int can contain will report as math.MaxInt.
type: integer
total:
description: Total is the total number of IPs configured for the
pool. Counts greater than int can contain will report as math.MaxInt.
description: |-
Total is the total number of IPs configured for the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
used:
description: Used is the count of allocated IPs in the pool. Counts
greater than int can contain will report as math.MaxInt.
description: |-
Used is the count of allocated IPs in the pool.
Counts greater than int can contain will report as math.MaxInt.
type: integer
required:
- free
Expand All @@ -236,9 +262,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading