Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .cruft.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"template": "https://github.com/projectsyn/commodore-component-template.git",
"commit": "37002ce82651841be39ce0089de09962e0cef932",
"commit": "4c5e2e3302ad838781795162fca1cd512139129c",
"checkout": "main",
"context": {
"cookiecutter": {
"name": "capi-core",
"slug": "capi-core",
"parameter_key": "capi_core",
"test_cases": "defaults old-kustomize-path new-kustomize-path user-kubeconfig-server",
"test_cases": "defaults old-kustomize-path user-kubeconfig-server",
"add_lib": "y",
"add_pp": "n",
"add_golden": "y",
Expand All @@ -25,7 +25,7 @@
"github_name": "component-capi-core",
"github_url": "https://github.com/projectsyn/component-capi-core",
"_template": "https://github.com/projectsyn/commodore-component-template.git",
"_commit": "37002ce82651841be39ce0089de09962e0cef932"
"_commit": "4c5e2e3302ad838781795162fca1cd512139129c"
}
},
"directory": null
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
instance:
- defaults
- old-kustomize-path
- new-kustomize-path
- user-kubeconfig-server
defaults:
run:
Expand All @@ -52,7 +51,6 @@ jobs:
instance:
- defaults
- old-kustomize-path
- new-kustomize-path
- user-kubeconfig-server
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ KUBENT_IMAGE ?= ghcr.io/doitintl/kube-no-trouble:latest
KUBENT_DOCKER ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)

instance ?= defaults
test_instances = tests/defaults.yml tests/old-kustomize-path.yml tests/new-kustomize-path.yml tests/user-kubeconfig-server.yml
test_instances = tests/defaults.yml tests/old-kustomize-path.yml tests/user-kubeconfig-server.yml
2 changes: 1 addition & 1 deletion class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ parameters:
cluster-api:
registry: registry.k8s.io
image: cluster-api/cluster-api-controller
tag: v1.13.6
tag: v1.14.2
caddy:
registry: docker.io
repository: caddy/caddy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cluster-api/capi-serving-cert
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.21.0
labels:
app.kubernetes.io/managed-by: commodore
cluster.x-k8s.io/provider: cluster-api
Expand Down Expand Up @@ -1613,7 +1613,7 @@ spec:
deletePolicy:
description: |-
deletePolicy defines the policy used by the MachineDeployment to identify nodes to delete when downscaling.
Valid values are "Random, "Newest", "Oldest"
Valid values are "Random", "Newest", "Oldest"
When no value is supplied, the default DeletePolicy of MachineSet is used
enum:
- Random
Expand Down Expand Up @@ -4137,7 +4137,7 @@ spec:
order:
description: |-
order defines the order in which Machines are deleted when downscaling.
Defaults to "Random". Valid values are "Random, "Newest", "Oldest"
Defaults to "Random". Valid values are "Random", "Newest", "Oldest"
enum:
- Random
- Newest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cluster-api/capi-serving-cert
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.21.0
labels:
app.kubernetes.io/managed-by: commodore
cluster.x-k8s.io/provider: cluster-api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cluster-api/capi-serving-cert
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.21.0
labels:
app.kubernetes.io/managed-by: commodore
cluster.x-k8s.io/provider: cluster-api
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cluster-api/capi-serving-cert
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.21.0
labels:
app.kubernetes.io/managed-by: commodore
cluster.x-k8s.io/provider: cluster-api
Expand Down Expand Up @@ -1124,7 +1124,7 @@ spec:
deletePolicy:
description: |-
deletePolicy defines the policy used by the MachineDeployment to identify nodes to delete when downscaling.
Valid values are "Random, "Newest", "Oldest"
Valid values are "Random", "Newest", "Oldest"
When no value is supplied, the default DeletePolicy of MachineSet is used
enum:
- Random
Expand Down Expand Up @@ -1734,6 +1734,56 @@ spec:
up-to-date when Machine's UpToDate condition is true.
format: int32
type: integer
upgradePlan:
description: |-
upgradePlan reports the list of versions that would be applied to the control plane object according to the upgrade plan.
Note:
- This field is set only when the Cluster topology is managed by Cluster API and a Cluster upgrade is in progress.
- Once a version is applied to the control plane object, it is removed from the list (after a version
is applied to a control plane object, it might take some time for the actual upgrade to complete)
- During a chained upgrade, the upgrade plan is continuously re-computed, and this field will
report only the last known upgrade plan.
items:
description: StatusUpgradePlanVersion groups upgrade plan
version-related status information.
properties:
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
versions:
description: versions is the aggregated Kubernetes versions
in this control plane.
items:
description: StatusVersion groups version-related status
information.
properties:
replicas:
description: replicas is the number of replicas at this
version.
format: int32
minimum: 1
type: integer
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
type: object
workers:
description: workers groups all the observations about Cluster's
Expand Down Expand Up @@ -1768,6 +1818,56 @@ spec:
up-to-date when Machine's UpToDate condition is true.
format: int32
type: integer
upgradePlan:
description: |-
upgradePlan reports the list of versions that would be applied to the worker objects (all MachineDeployments and MachinePools).
Note:
- This field is set only when the Cluster topology is managed by Cluster API and a Cluster upgrade is in progress.
- Once a version is applied to the worker objects, it is removed from the list (after a version
is applied to a worker object, it might take some time for the actual upgrade to complete)
- During a chained upgrade, the upgrade plan is continuously re-computed, and this field will
report only the last known upgrade plan.
items:
description: StatusUpgradePlanVersion groups upgrade plan
version-related status information.
properties:
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
versions:
description: versions is the aggregated Kubernetes versions
in cluster workers.
items:
description: StatusVersion groups version-related status
information.
properties:
replicas:
description: replicas is the number of replicas at this
version.
format: int32
minimum: 1
type: integer
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
type: object
type: object
type: object
Expand Down Expand Up @@ -2637,7 +2737,7 @@ spec:
order:
description: |-
order defines the order in which Machines are deleted when downscaling.
Defaults to "Random". Valid values are "Random, "Newest", "Oldest"
Defaults to "Random". Valid values are "Random", "Newest", "Oldest"
enum:
- Random
- Newest
Expand Down Expand Up @@ -3510,6 +3610,55 @@ spec:
when Machine's UpToDate condition is true.
format: int32
type: integer
upgradePlan:
description: |-
upgradePlan reports the list of versions that would be applied to the control plane object according to the upgrade plan.
Note:
- This field is set only when the Cluster topology is managed by Cluster API and a Cluster upgrade is in progress.
- Once a version is applied to the control plane object, it is removed from the list (after a version
is applied to a control plane object, it might take some time for the actual upgrade to complete)
- During a chained upgrade, the upgrade plan is continuously re-computed, and this field will
report only the last known upgrade plan.
items:
description: StatusUpgradePlanVersion groups upgrade plan version-related
status information.
properties:
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
versions:
description: versions is the aggregated Kubernetes versions in
this control plane.
items:
description: StatusVersion groups version-related status information.
properties:
replicas:
description: replicas is the number of replicas at this
version.
format: int32
minimum: 1
type: integer
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
type: object
deprecated:
description: deprecated groups all the status fields that are deprecated
Expand Down Expand Up @@ -3699,6 +3848,55 @@ spec:
when Machine's UpToDate condition is true.
format: int32
type: integer
upgradePlan:
description: |-
upgradePlan reports the list of versions that would be applied to the worker objects (all MachineDeployments and MachinePools).
Note:
- This field is set only when the Cluster topology is managed by Cluster API and a Cluster upgrade is in progress.
- Once a version is applied to the worker objects, it is removed from the list (after a version
is applied to a worker object, it might take some time for the actual upgrade to complete)
- During a chained upgrade, the upgrade plan is continuously re-computed, and this field will
report only the last known upgrade plan.
items:
description: StatusUpgradePlanVersion groups upgrade plan version-related
status information.
properties:
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
versions:
description: versions is the aggregated Kubernetes versions in
cluster workers.
items:
description: StatusVersion groups version-related status information.
properties:
replicas:
description: replicas is the number of replicas at this
version.
format: int32
minimum: 1
type: integer
version:
description: version is the Kubernetes version.
maxLength: 256
minLength: 1
type: string
required:
- version
type: object
maxItems: 32
minItems: 1
type: array
x-kubernetes-list-type: atomic
type: object
type: object
required:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: syn-cluster-api/capi-serving-cert
controller-gen.kubebuilder.io/version: v0.20.0
controller-gen.kubebuilder.io/version: v0.21.0
labels:
app.kubernetes.io/managed-by: commodore
cluster.x-k8s.io/provider: cluster-api
Expand Down Expand Up @@ -287,7 +287,7 @@ spec:
timeoutSeconds:
description: |-
timeoutSeconds defines the timeout duration for client calls to the ExtensionHandler.
Defaults to 10 is not set.
Defaults to 10 seconds if not set.
format: int32
type: integer
required:
Expand Down
Loading
Loading