Skip to content

[UP] ⬆️ Update S3Operator chart to support new s3Operator ver… #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[UP] ⬆️ Update S3Operator chart to support new s3Operator ver… #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/s3-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.5.5
version: 0.6.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
45 changes: 24 additions & 21 deletions charts/s3-operator/templates/bucket-crd.yaml → charts/s3-operator/templates/crd-bucket.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: buckets.s3.onyxia.sh
annotations:
{{- if .Values.crds.keep }}
"helm.sh/resource-policy": keep
helm.sh/resource-policy: keep
{{- end }}
controller-gen.kubebuilder.io/version: v0.10.0
controller-gen.kubebuilder.io/version: v0.11.1
labels:
{{- include "s3-operator.labels" . | nindent 4 }}
name: buckets.s3.onyxia.sh
spec:
group: s3.onyxia.sh
names:
Expand Down Expand Up @@ -61,23 +61,32 @@ spec:
required:
- default
type: object
s3InstanceRef:
default: s3-operator/default
description: s3InstanceRef where create the bucket
maxLength: 127
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?(/[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?)?$
type: string
x-kubernetes-validations:
- message: s3InstanceRef is immutable
rule: self == oldSelf
required:
- name
- quota
- s3InstanceRef
type: object
status:
description: BucketStatus defines the observed state of Bucket
properties:
conditions:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file'
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\",
\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\"
Expand All @@ -91,8 +100,8 @@ spec:
format: date-time
type: string
message:
description: message is a human readable message indicating details
about the transition. This may be an empty string.
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
Expand All @@ -106,11 +115,11 @@ spec:
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.
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_])?$
Expand Down Expand Up @@ -145,10 +154,4 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
{{- end }}
14 changes: 12 additions & 2 deletions charts/s3-operator/templates/paths-crd.yaml → charts/s3-operator/templates/crd-paths.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: paths.s3.onyxia.sh
annotations:
{{- if .Values.crds.keep }}
"helm.sh/resource-policy": keep
helm.sh/resource-policy: keep
{{- end }}
controller-gen.kubebuilder.io/version: v0.11.1
labels:
{{- include "s3-operator.labels" . | nindent 4 }}
name: paths.s3.onyxia.sh
spec:
group: s3.onyxia.sh
names:
Expand Down Expand Up @@ -47,6 +47,16 @@ spec:
items:
type: string
type: array
s3InstanceRef:
default: s3-operator/default
description: s3InstanceRef where create the Paths
maxLength: 127
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?(/[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?)?$
type: string
x-kubernetes-validations:
- message: s3InstanceRef is immutable
rule: self == oldSelf
required:
- bucketName
type: object
Expand Down
44 changes: 23 additions & 21 deletions charts/s3-operator/templates/policy-crd.yaml → ...s/s3-operator/templates/crd-policies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: policies.s3.onyxia.sh
annotations:
{{- if .Values.crds.keep }}
"helm.sh/resource-policy": keep
helm.sh/resource-policy: keep
{{- end }}
controller-gen.kubebuilder.io/version: v0.10.0
controller-gen.kubebuilder.io/version: v0.11.1
labels:
{{- include "s3-operator.labels" . | nindent 4 }}
name: policies.s3.onyxia.sh
spec:
group: s3.onyxia.sh
names:
Expand Down Expand Up @@ -45,6 +45,16 @@ spec:
policyContent:
description: Content of the policy (IAM JSON format)
type: string
s3InstanceRef:
default: s3-operator/default
description: s3InstanceRef where create the Policy
maxLength: 127
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?(/[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])?)?$
type: string
x-kubernetes-validations:
- message: s3InstanceRef is immutable
rule: self == oldSelf
required:
- name
- policyContent
Expand All @@ -53,15 +63,13 @@ spec:
description: PolicyStatus defines the observed state of Policy
properties:
conditions:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerate code after modifying
this file'
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\",
\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\"
Expand All @@ -75,8 +83,8 @@ spec:
format: date-time
type: string
message:
description: message is a human readable message indicating details
about the transition. This may be an empty string.
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
Expand All @@ -90,11 +98,11 @@ spec:
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.
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_])?$
Expand Down Expand Up @@ -129,10 +137,4 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
{{- end }}
Loading