Skip to content

Commit 79c9f57

Browse files
authored
Merge pull request #8549 from killianmuldoon/pr-stop-v1alpha3
⚠️ Stop serving v1alpha3 API types
2 parents fce3e82 + aeabb99 commit 79c9f57

File tree

51 files changed

+128
-890
lines changed

Some content is hidden

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

51 files changed

+128
-890
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,14 +472,10 @@ generate-modules: ## Run go mod tidy to ensure modules are up to date
472472
cd $(TEST_DIR); go mod tidy
473473

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

477477
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
478478

479-
.PHONY: generate-e2e-templates-v0.3
480-
generate-e2e-templates-v0.3: $(KUSTOMIZE)
481-
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.3/cluster-template.yaml
482-
483479
.PHONY: generate-e2e-templates-v0.4
484480
generate-e2e-templates-v0.4: $(KUSTOMIZE)
485481
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.4/cluster-template.yaml

api/v1alpha3/cluster_types.go

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

202202
// +kubebuilder:object:root=true
203+
// +kubebuilder:unservedversion
203204
// +kubebuilder:deprecatedversion
204205
// +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api
205206
// +kubebuilder:subresource:status

api/v1alpha3/machine_types.go

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

239239
// +kubebuilder:object:root=true
240+
// +kubebuilder:unservedversion
240241
// +kubebuilder:deprecatedversion
241242
// +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api
242243
// +kubebuilder:subresource:status

api/v1alpha3/machinedeployment_types.go

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

243243
// +kubebuilder:object:root=true
244+
// +kubebuilder:unservedversion
244245
// +kubebuilder:deprecatedversion
245246
// +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api
246247
// +kubebuilder:subresource:status

api/v1alpha3/machinehealthcheck_types.go

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

116116
// +kubebuilder:object:root=true
117+
// +kubebuilder:unservedversion
117118
// +kubebuilder:deprecatedversion
118119
// +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api
119120
// +kubebuilder:subresource:status

api/v1alpha3/machineset_types.go

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

187187
// +kubebuilder:object:root=true
188+
// +kubebuilder:unservedversion
188189
// +kubebuilder:deprecatedversion
189190
// +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api
190191
// +kubebuilder:subresource:status

api/v1alpha3/webhook_test.go

Lines changed: 0 additions & 123 deletions
This file was deleted.

bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go

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

134134
// +kubebuilder:object:root=true
135+
// +kubebuilder:unservedversion
135136
// +kubebuilder:deprecatedversion
136137
// +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api
137138
// +kubebuilder:subresource:status

bootstrap/kubeadm/api/v1alpha3/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

bootstrap/kubeadm/api/v1alpha3/webhook_test.go

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)