-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51 from detiber/withImages
Update to use image-builder based images
- Loading branch information
Showing
63 changed files
with
1,281 additions
and
605 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha3 | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| ) | ||
|
|
||
| const ( | ||
| osUbuntu = "ubuntu" | ||
| defaultUbuntuVersion = "20.04" | ||
| defaultOSDistro = osUbuntu | ||
| ) | ||
|
|
||
| // SetupWebhookWithManager sets up and registers the webhook with the manager. | ||
| func (c *TinkerbellCluster) SetupWebhookWithManager(mgr ctrl.Manager) error { | ||
| return ctrl.NewWebhookManagedBy(mgr). | ||
| For(c). | ||
| Complete() | ||
| } | ||
|
|
||
| // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-tinkerbellcluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=tinkerbellclusters,versions=v1alpha3,name=validation.tinkerbellcluster.infrastructure.cluster.x-k8s.io,sideEffects=None | ||
| // +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1alpha3-tinkerbellcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=tinkerbellclusters,versions=v1alpha3,name=default.tinkerbellcluster.infrastructure.cluster.x-k8s.io,sideEffects=None | ||
|
|
||
| // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (c *TinkerbellCluster) ValidateCreate() error { | ||
| return nil | ||
| } | ||
|
|
||
| // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (c *TinkerbellCluster) ValidateUpdate(oldRaw runtime.Object) error { | ||
| return nil | ||
| } | ||
|
|
||
| // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. | ||
| func (c *TinkerbellCluster) ValidateDelete() error { | ||
| return nil | ||
| } | ||
|
|
||
| func defaultVersionForOSDistro(distro string) string { | ||
| if strings.ToLower(distro) == osUbuntu { | ||
| return defaultUbuntuVersion | ||
| } | ||
|
|
||
| return "" | ||
| } | ||
|
|
||
| // Default implements webhookutil.defaulter so a webhook will be registered for the type. | ||
| func (c *TinkerbellCluster) Default() { | ||
| if c.Spec.ImageLookupFormat == "" { | ||
| c.Spec.ImageLookupFormat = "{{.BaseURL}}{{.OSDistro}}-{{.OSVersion}}-kube-{{.KubernetesVersion}}.gz" | ||
| } | ||
|
|
||
| if c.Spec.ImageLookupBaseURL == "" { | ||
| tinkIP := os.Getenv("TINKERBELL_IP") | ||
| c.Spec.ImageLookupBaseURL = fmt.Sprintf("http://%s:8080/", tinkIP) | ||
| } | ||
|
|
||
| if c.Spec.ImageLookupOSDistro == "" { | ||
| c.Spec.ImageLookupOSDistro = defaultOSDistro | ||
| } | ||
|
|
||
| if c.Spec.ImageLookupOSVersion == "" { | ||
| c.Spec.ImageLookupOSVersion = defaultVersionForOSDistro(c.Spec.ImageLookupOSDistro) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha3 | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/util/validation/field" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| ) | ||
|
|
||
| // SetupWebhookWithManager sets up and registers the webhook with the manager. | ||
| func (m *TinkerbellMachine) SetupWebhookWithManager(mgr ctrl.Manager) error { | ||
| return ctrl.NewWebhookManagedBy(mgr). | ||
| For(m). | ||
| Complete() | ||
| } | ||
|
|
||
| // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-tinkerbellmachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=tinkerbellmachines,versions=v1alpha3,name=validation.tinkerbellmachine.infrastructure.cluster.x-k8s.io,sideEffects=None | ||
|
|
||
| // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachine) ValidateCreate() error { | ||
| return nil | ||
| } | ||
|
|
||
| // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachine) ValidateUpdate(oldRaw runtime.Object) error { | ||
| var allErrs field.ErrorList | ||
|
|
||
| old, _ := oldRaw.(*TinkerbellMachine) | ||
|
|
||
| if old.Spec.HardwareName != "" && m.Spec.HardwareName != old.Spec.HardwareName { | ||
| allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "hardwareName"), "is immutable once set")) | ||
| } | ||
|
|
||
| if old.Spec.ProviderID != "" && m.Spec.ProviderID != old.Spec.ProviderID { | ||
| allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "providerID"), "is immutable once set")) | ||
| } | ||
|
|
||
| return aggregateObjErrors(m.GroupVersionKind().GroupKind(), m.Name, allErrs) | ||
| } | ||
|
|
||
| // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachine) ValidateDelete() error { | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha3 | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/util/validation/field" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| ) | ||
|
|
||
| // SetupWebhookWithManager sets up and registers the webhook with the manager. | ||
| func (m *TinkerbellMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error { | ||
| return ctrl.NewWebhookManagedBy(mgr). | ||
| For(m). | ||
| Complete() | ||
| } | ||
|
|
||
| // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-tinkerbellmachinetemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=tinkerbellmachinetemplates,versions=v1alpha3,name=validation.tinkerbellmachinetemplate.infrastructure.x-k8s.io,sideEffects=None | ||
|
|
||
| // ValidateCreate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachineTemplate) ValidateCreate() error { | ||
| var allErrs field.ErrorList | ||
|
|
||
| spec := m.Spec.Template.Spec | ||
| fieldBasePath := field.NewPath("spec", "template", "spec") | ||
|
|
||
| if spec.ProviderID != "" { | ||
| allErrs = append(allErrs, field.Forbidden(fieldBasePath.Child("providerID"), "cannot be set in templates")) | ||
| } | ||
|
|
||
| if spec.HardwareName != "" { | ||
| allErrs = append(allErrs, field.Forbidden(fieldBasePath.Child("hardwareName"), "cannot be set in templates")) | ||
| } | ||
|
|
||
| return aggregateObjErrors(m.GroupVersionKind().GroupKind(), m.Name, allErrs) | ||
| } | ||
|
|
||
| // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachineTemplate) ValidateUpdate(old runtime.Object) error { | ||
| oldTinkerbellMachineTemplate, _ := old.(*TinkerbellMachineTemplate) | ||
|
|
||
| if !reflect.DeepEqual(m.Spec, oldTinkerbellMachineTemplate.Spec) { | ||
| return apierrors.NewBadRequest("TinkerbellMachineTemplate.Spec is immutable") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // ValidateDelete implements webhook.Validator so a webhook will be registered for the type. | ||
| func (m *TinkerbellMachineTemplate) ValidateDelete() error { | ||
| return nil | ||
| } |
Oops, something went wrong.