-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
🐛 (deployimage/v1-beta1): fix scaffold with multigroup and add option…
…al plugins to multigroup sample to validate changes
- Loading branch information
1 parent
be40047
commit 94fa2b5
Showing
35 changed files
with
3,510 additions
and
21 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
77 changes: 77 additions & 0 deletions
77
testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go
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,77 @@ | ||
| /* | ||
| Copyright 2023 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 v1alpha1 | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! | ||
| // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. | ||
|
|
||
| // BusyboxSpec defines the desired state of Busybox | ||
| type BusyboxSpec struct { | ||
| // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster | ||
| // Important: Run "make" to regenerate code after modifying this file | ||
|
|
||
| // Size defines the number of Busybox instances | ||
| // The following markers will use OpenAPI v3 schema to validate the value | ||
| // More info: https://book.kubebuilder.io/reference/markers/crd-validation.html | ||
| // +kubebuilder:validation:Minimum=1 | ||
| // +kubebuilder:validation:Maximum=3 | ||
| // +kubebuilder:validation:ExclusiveMaximum=false | ||
| Size int32 `json:"size,omitempty"` | ||
| } | ||
|
|
||
| // BusyboxStatus defines the observed state of Busybox | ||
| type BusyboxStatus struct { | ||
| // Represents the observations of a Busybox's current state. | ||
| // Busybox.status.conditions.type are: "Available", "Progressing", and "Degraded" | ||
| // Busybox.status.conditions.status are one of True, False, Unknown. | ||
| // Busybox.status.conditions.reason the value should be a CamelCase string and producers of specific | ||
| // condition types may define expected values and meanings for this field, and whether the values | ||
| // are considered a guaranteed API. | ||
| // Busybox.status.conditions.Message is a human readable message indicating details about the transition. | ||
| // For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties | ||
|
|
||
| Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
| //+kubebuilder:subresource:status | ||
|
|
||
| // Busybox is the Schema for the busyboxes API | ||
| type Busybox struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec BusyboxSpec `json:"spec,omitempty"` | ||
| Status BusyboxStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
|
|
||
| // BusyboxList contains a list of Busybox | ||
| type BusyboxList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []Busybox `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&Busybox{}, &BusyboxList{}) | ||
| } |
36 changes: 36 additions & 0 deletions
36
testdata/project-v4-multigroup/api/example.com/v1alpha1/groupversion_info.go
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,36 @@ | ||
| /* | ||
| Copyright 2023 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 v1alpha1 contains API Schema definitions for the example.com v1alpha1 API group | ||
| // +kubebuilder:object:generate=true | ||
| // +groupName=example.com.testproject.org | ||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "sigs.k8s.io/controller-runtime/pkg/scheme" | ||
| ) | ||
|
|
||
| var ( | ||
| // GroupVersion is group version used to register these objects | ||
| GroupVersion = schema.GroupVersion{Group: "example.com.testproject.org", Version: "v1alpha1"} | ||
|
|
||
| // SchemeBuilder is used to add go types to the GroupVersionKind scheme | ||
| SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} | ||
|
|
||
| // AddToScheme adds the types in this group-version to the given scheme. | ||
| AddToScheme = SchemeBuilder.AddToScheme | ||
| ) |
80 changes: 80 additions & 0 deletions
80
testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go
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,80 @@ | ||
| /* | ||
| Copyright 2023 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 v1alpha1 | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| // EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! | ||
| // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. | ||
|
|
||
| // MemcachedSpec defines the desired state of Memcached | ||
| type MemcachedSpec struct { | ||
| // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster | ||
| // Important: Run "make" to regenerate code after modifying this file | ||
|
|
||
| // Size defines the number of Memcached instances | ||
| // The following markers will use OpenAPI v3 schema to validate the value | ||
| // More info: https://book.kubebuilder.io/reference/markers/crd-validation.html | ||
| // +kubebuilder:validation:Minimum=1 | ||
| // +kubebuilder:validation:Maximum=3 | ||
| // +kubebuilder:validation:ExclusiveMaximum=false | ||
| Size int32 `json:"size,omitempty"` | ||
|
|
||
| // Port defines the port that will be used to init the container with the image | ||
| ContainerPort int32 `json:"containerPort,omitempty"` | ||
| } | ||
|
|
||
| // MemcachedStatus defines the observed state of Memcached | ||
| type MemcachedStatus struct { | ||
| // Represents the observations of a Memcached's current state. | ||
| // Memcached.status.conditions.type are: "Available", "Progressing", and "Degraded" | ||
| // Memcached.status.conditions.status are one of True, False, Unknown. | ||
| // Memcached.status.conditions.reason the value should be a CamelCase string and producers of specific | ||
| // condition types may define expected values and meanings for this field, and whether the values | ||
| // are considered a guaranteed API. | ||
| // Memcached.status.conditions.Message is a human readable message indicating details about the transition. | ||
| // For further information see: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties | ||
|
|
||
| Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
| //+kubebuilder:subresource:status | ||
|
|
||
| // Memcached is the Schema for the memcacheds API | ||
| type Memcached struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec MemcachedSpec `json:"spec,omitempty"` | ||
| Status MemcachedStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
|
|
||
| // MemcachedList contains a list of Memcached | ||
| type MemcachedList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []Memcached `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&Memcached{}, &MemcachedList{}) | ||
| } |
65 changes: 65 additions & 0 deletions
65
testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_webhook.go
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,65 @@ | ||
| /* | ||
| Copyright 2023 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 v1alpha1 | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook" | ||
| "sigs.k8s.io/controller-runtime/pkg/webhook/admission" | ||
| ) | ||
|
|
||
| // log is for logging in this package. | ||
| var memcachedlog = logf.Log.WithName("memcached-resource") | ||
|
|
||
| func (r *Memcached) SetupWebhookWithManager(mgr ctrl.Manager) error { | ||
| return ctrl.NewWebhookManagedBy(mgr). | ||
| For(r). | ||
| Complete() | ||
| } | ||
|
|
||
| // TODO(user): EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN! | ||
|
|
||
| // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation. | ||
| //+kubebuilder:webhook:path=/validate-example-com-testproject-org-v1alpha1-memcached,mutating=false,failurePolicy=fail,sideEffects=None,groups=example.com.testproject.org,resources=memcacheds,verbs=create;update,versions=v1alpha1,name=vmemcached.kb.io,admissionReviewVersions=v1 | ||
|
|
||
| var _ webhook.Validator = &Memcached{} | ||
|
|
||
| // ValidateCreate implements webhook.Validator so a webhook will be registered for the type | ||
| func (r *Memcached) ValidateCreate() (admission.Warnings, error) { | ||
| memcachedlog.Info("validate create", "name", r.Name) | ||
|
|
||
| // TODO(user): fill in your validation logic upon object creation. | ||
| return nil, nil | ||
| } | ||
|
|
||
| // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type | ||
| func (r *Memcached) ValidateUpdate(old runtime.Object) (admission.Warnings, error) { | ||
| memcachedlog.Info("validate update", "name", r.Name) | ||
|
|
||
| // TODO(user): fill in your validation logic upon object update. | ||
| return nil, nil | ||
| } | ||
|
|
||
| // ValidateDelete implements webhook.Validator so a webhook will be registered for the type | ||
| func (r *Memcached) ValidateDelete() (admission.Warnings, error) { | ||
| memcachedlog.Info("validate delete", "name", r.Name) | ||
|
|
||
| // TODO(user): fill in your validation logic upon object deletion. | ||
| return nil, nil | ||
| } |
Oops, something went wrong.