From 12ac1df70e9721f66d101f546f0c233d0923f196 Mon Sep 17 00:00:00 2001 From: Eneman Donatien Date: Fri, 23 Aug 2024 10:07:48 +0200 Subject: [PATCH] implement mulittenancy --- api/v1alpha1/s3instance_types.go | 84 +++++++++++ api/v1alpha1/zz_generated.deepcopy.go | 98 +++++++++++- .../crd/bases/s3.onyxia.sh_s3instances.yaml | 140 ++++++++++++++++++ 3 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 api/v1alpha1/s3instance_types.go create mode 100644 config/crd/bases/s3.onyxia.sh_s3instances.yaml diff --git a/api/v1alpha1/s3instance_types.go b/api/v1alpha1/s3instance_types.go new file mode 100644 index 0000000..16a929d --- /dev/null +++ b/api/v1alpha1/s3instance_types.go @@ -0,0 +1,84 @@ +/* +Copyright 2023. + +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. + +// S3InstanceSpec defines the desired state of S3Instance +type S3InstanceSpec struct { + + // type of the S3Instance + // +kubebuilder:validation:Required + S3Provider string `json:"s3Provider"` + + // url of the S3Instance + // +kubebuilder:validation:Required + UrlEndpoint string `json:"urlEndpoint"` + + // SecretName associated to the S3Instance containing accessKey and secretKey + // +kubebuilder:validation:Required + SecretName string `json:"secretName"` + + // region associated to the S3Instance + // +kubebuilder:validation:Required + Region string `json:"region"` + + // useSSL when connecting to the S3Instance + // +kubebuilder:validation:Optional + UseSSL bool `json:"useSSL,omitempty"` + + // CaCertificatesBase64 associated to the S3InstanceUrl + // +kubebuilder:validation:Optional + CaCertificatesBase64 string `json:"caCertificateBase64,omitempty"` +} + +// S3InstanceStatus defines the observed state of S3Instance +type S3InstanceStatus struct { + // Status management using Conditions. + // See also : 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"` +} + +//+kubebuilder:object:root=true +//+kubebuilder:subresource:status + +// S3Instance is the Schema for the S3Instances API +type S3Instance struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec S3InstanceSpec `json:"spec,omitempty"` + Status S3InstanceStatus `json:"status,omitempty"` +} + +//+kubebuilder:object:root=true + +// S3InstanceList contains a list of S3Instance +type S3InstanceList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []S3Instance `json:"items"` +} + +// func init() { +// SchemeBuilder.Register(&S3Instance{}, &S3InstanceList{}) +// } diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 6761cdf..17bf39b 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -340,6 +340,102 @@ func (in *Quota) DeepCopy() *Quota { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *S3Instance) DeepCopyInto(out *S3Instance) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new S3Instance. +func (in *S3Instance) DeepCopy() *S3Instance { + if in == nil { + return nil + } + out := new(S3Instance) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *S3Instance) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *S3InstanceList) DeepCopyInto(out *S3InstanceList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]S3Instance, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new S3InstanceList. +func (in *S3InstanceList) DeepCopy() *S3InstanceList { + if in == nil { + return nil + } + out := new(S3InstanceList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *S3InstanceList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *S3InstanceSpec) DeepCopyInto(out *S3InstanceSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new S3InstanceSpec. +func (in *S3InstanceSpec) DeepCopy() *S3InstanceSpec { + if in == nil { + return nil + } + out := new(S3InstanceSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *S3InstanceStatus) DeepCopyInto(out *S3InstanceStatus) { + *out = *in + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]v1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new S3InstanceStatus. +func (in *S3InstanceStatus) DeepCopy() *S3InstanceStatus { + if in == nil { + return nil + } + out := new(S3InstanceStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *S3User) DeepCopyInto(out *S3User) { *out = *in @@ -439,4 +535,4 @@ func (in *S3UserStatus) DeepCopy() *S3UserStatus { out := new(S3UserStatus) in.DeepCopyInto(out) return out -} \ No newline at end of file +} diff --git a/config/crd/bases/s3.onyxia.sh_s3instances.yaml b/config/crd/bases/s3.onyxia.sh_s3instances.yaml new file mode 100644 index 0000000..ae97235 --- /dev/null +++ b/config/crd/bases/s3.onyxia.sh_s3instances.yaml @@ -0,0 +1,140 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.11.1 + creationTimestamp: null + name: s3instances.s3.onyxia.sh +spec: + group: s3.onyxia.sh + names: + kind: S3Instance + listKind: S3InstanceList + plural: s3instances + singular: s3instance + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: S3Instance is the Schema for the S3Instances API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: S3InstanceSpec defines the desired state of S3Instance + properties: + caCertificateBase64: + description: CaCertificatesBase64 associated to the S3InstanceUrl + type: string + region: + description: region associated to the S3Instance + type: string + s3Provider: + description: type of the S3Instance + type: string + secretName: + description: SecretName associated to the S3Instance containing accessKey + and secretKey + type: string + urlEndpoint: + description: url of the S3Instance + type: string + useSSL: + description: useSSL when connecting to the S3Instance + type: boolean + required: + - region + - s3Provider + - secretName + - urlEndpoint + type: object + status: + description: S3InstanceStatus defines the observed state of S3Instance + properties: + conditions: + description: 'Status management using Conditions. See also : https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties' + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + type: object + type: object + served: true + storage: true + subresources: + status: {}