Skip to content

Commit 6acff21

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#8996 from killianmuldoon/pr-stop-serving-v1alpha4
⚠️ Stop serving v1alpha4 API Versions
2 parents 46e045c + acffb87 commit 6acff21

File tree

49 files changed

+75
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+75
-280
lines changed

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,15 +504,11 @@ generate-modules: ## Run go mod tidy to ensure modules are up to date
504504
cd $(TEST_DIR); go mod tidy
505505

506506
.PHONY: generate-e2e-templates
507-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.4 v1.0 v1.3 v1.4 main) ## Generate cluster templates for all versions
507+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.0 v1.3 v1.4 main) ## Generate cluster templates for all versions
508508

509509
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
510510
INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
511511

512-
.PHONY: generate-e2e-templates-v0.4
513-
generate-e2e-templates-v0.4: $(KUSTOMIZE)
514-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.4/cluster-template.yaml
515-
516512
.PHONY: generate-e2e-templates-v1.0
517513
generate-e2e-templates-v1.0: $(KUSTOMIZE)
518514
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.0/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.0/cluster-template.yaml

‎api/v1alpha4/cluster_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ func (v APIEndpoint) String() string {
276276
// ANCHOR_END: APIEndpoint
277277

278278
// +kubebuilder:object:root=true
279+
// +kubebuilder:unservedversion
279280
// +kubebuilder:deprecatedversion
280281
// +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api
281282
// +kubebuilder:subresource:status

‎api/v1alpha4/clusterclass_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
)
2323

2424
// +kubebuilder:object:root=true
25+
// +kubebuilder:unservedversion
2526
// +kubebuilder:deprecatedversion
2627
// +kubebuilder:resource:path=clusterclasses,shortName=cc,scope=Namespaced,categories=cluster-api
2728
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterClass"

‎api/v1alpha4/machine_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ type Bootstrap struct {
234234
// ANCHOR_END: Bootstrap
235235

236236
// +kubebuilder:object:root=true
237+
// +kubebuilder:unservedversion
237238
// +kubebuilder:deprecatedversion
238239
// +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api
239240
// +kubebuilder:subresource:status

‎api/v1alpha4/machinedeployment_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase {
270270
}
271271

272272
// +kubebuilder:object:root=true
273+
// +kubebuilder:unservedversion
273274
// +kubebuilder:deprecatedversion
274275
// +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api
275276
// +kubebuilder:subresource:status

‎api/v1alpha4/machinehealthcheck_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ type MachineHealthCheckStatus struct {
125125
// ANCHOR_END: MachineHealthCheckStatus
126126

127127
// +kubebuilder:object:root=true
128+
// +kubebuilder:unservedversion
128129
// +kubebuilder:deprecatedversion
129130
// +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api
130131
// +kubebuilder:subresource:status

‎api/v1alpha4/machineset_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ func (m *MachineSet) Validate() field.ErrorList {
195195
}
196196

197197
// +kubebuilder:object:root=true
198+
// +kubebuilder:unservedversion
198199
// +kubebuilder:deprecatedversion
199200
// +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api
200201
// +kubebuilder:subresource:status

‎bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ type KubeadmConfigStatus struct {
124124
}
125125

126126
// +kubebuilder:object:root=true
127+
// +kubebuilder:unservedversion
127128
// +kubebuilder:deprecatedversion
128129
// +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api
129130
// +kubebuilder:subresource:status

‎bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type KubeadmConfigTemplateResource struct {
3131
}
3232

3333
// +kubebuilder:object:root=true
34+
// +kubebuilder:unservedversion
3435
// +kubebuilder:deprecatedversion
3536
// +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api
3637
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmConfigTemplate"

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)