Skip to content

Commit f436ebc

Browse files
committed
Replace minio with s3proxy
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 792044b commit f436ebc

3 files changed

Lines changed: 63 additions & 63 deletions

File tree

apis/installer/v1alpha1/ace_options_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ type AceOptionsSpec struct {
7171
DNSProxy AceOptionsComponentSpec `json:"dns-proxy"`
7272
Openfga AceOptionsComponentSpec `json:"openfga"`
7373
SMTPRelay AceOptionsComponentSpec `json:"smtprelay"`
74-
Minio AceOptionsComponentSpec `json:"minio"`
74+
S3proxy AceOptionsComponentSpec `json:"s3proxy"`
7575
Branding AceBrandingSpec `json:"branding"`
7676
SelfManagement AceSelfManagementOptions `json:"selfManagement"`
7777
}
@@ -386,7 +386,7 @@ type GeneratedValues struct {
386386
}
387387

388388
type PromotionValues struct {
389-
Minio AceOptionsInfraObjstore `json:"minio,omitempty"`
389+
S3proxy AceOptionsInfraObjstore `json:"s3proxy,omitempty"`
390390
}
391391

392392
type AcePlatformAdmin struct {

apis/installer/v1alpha1/zz_generated.deepcopy.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

schema/ace-options/values.openapiv3_schema.yaml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ properties:
269269
type: boolean
270270
promotionValues:
271271
properties:
272-
minio:
272+
s3proxy:
273273
properties:
274274
auth:
275275
properties:
@@ -1055,63 +1055,6 @@ properties:
10551055
required:
10561056
- enabled
10571057
type: object
1058-
minio:
1059-
properties:
1060-
enabled:
1061-
type: boolean
1062-
nodeSelector:
1063-
additionalProperties:
1064-
type: string
1065-
type: object
1066-
resources:
1067-
description: ResourceRequirements describes the compute resource requirements.
1068-
properties:
1069-
claims:
1070-
description: "Claims lists the names of resources, defined in spec.resourceClaims,\
1071-
\ that are used by this container. \n This is an alpha field and requires\
1072-
\ enabling the DynamicResourceAllocation feature gate. \n This field\
1073-
\ is immutable. It can only be set for containers."
1074-
items:
1075-
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
1076-
properties:
1077-
name:
1078-
description: Name must match the name of one entry in pod.spec.resourceClaims
1079-
of the Pod where this field is used. It makes that resource available
1080-
inside a container.
1081-
type: string
1082-
required:
1083-
- name
1084-
type: object
1085-
type: array
1086-
x-kubernetes-list-map-keys:
1087-
- name
1088-
x-kubernetes-list-type: map
1089-
limits:
1090-
additionalProperties:
1091-
anyOf:
1092-
- type: integer
1093-
- type: string
1094-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1095-
x-kubernetes-int-or-string: true
1096-
description: 'Limits describes the maximum amount of compute resources
1097-
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1098-
type: object
1099-
requests:
1100-
additionalProperties:
1101-
anyOf:
1102-
- type: integer
1103-
- type: string
1104-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1105-
x-kubernetes-int-or-string: true
1106-
description: 'Requests describes the minimum amount of compute resources
1107-
required. If Requests is omitted for a container, it defaults to Limits
1108-
if that is explicitly specified, otherwise to an implementation-defined
1109-
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1110-
type: object
1111-
type: object
1112-
required:
1113-
- enabled
1114-
type: object
11151058
monitoring:
11161059
properties:
11171060
agent:
@@ -1550,6 +1493,63 @@ properties:
15501493
- name
15511494
- namespace
15521495
type: object
1496+
s3proxy:
1497+
properties:
1498+
enabled:
1499+
type: boolean
1500+
nodeSelector:
1501+
additionalProperties:
1502+
type: string
1503+
type: object
1504+
resources:
1505+
description: ResourceRequirements describes the compute resource requirements.
1506+
properties:
1507+
claims:
1508+
description: "Claims lists the names of resources, defined in spec.resourceClaims,\
1509+
\ that are used by this container. \n This is an alpha field and requires\
1510+
\ enabling the DynamicResourceAllocation feature gate. \n This field\
1511+
\ is immutable. It can only be set for containers."
1512+
items:
1513+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
1514+
properties:
1515+
name:
1516+
description: Name must match the name of one entry in pod.spec.resourceClaims
1517+
of the Pod where this field is used. It makes that resource available
1518+
inside a container.
1519+
type: string
1520+
required:
1521+
- name
1522+
type: object
1523+
type: array
1524+
x-kubernetes-list-map-keys:
1525+
- name
1526+
x-kubernetes-list-type: map
1527+
limits:
1528+
additionalProperties:
1529+
anyOf:
1530+
- type: integer
1531+
- type: string
1532+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1533+
x-kubernetes-int-or-string: true
1534+
description: 'Limits describes the maximum amount of compute resources
1535+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1536+
type: object
1537+
requests:
1538+
additionalProperties:
1539+
anyOf:
1540+
- type: integer
1541+
- type: string
1542+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1543+
x-kubernetes-int-or-string: true
1544+
description: 'Requests describes the minimum amount of compute resources
1545+
required. If Requests is omitted for a container, it defaults to Limits
1546+
if that is explicitly specified, otherwise to an implementation-defined
1547+
value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
1548+
type: object
1549+
type: object
1550+
required:
1551+
- enabled
1552+
type: object
15531553
selfManagement:
15541554
properties:
15551555
enableMonitoring:
@@ -1864,7 +1864,6 @@ required:
18641864
- ingress
18651865
- kubedb-ui
18661866
- marketplace-ui
1867-
- minio
18681867
- monitoring
18691868
- nats
18701869
- openfga
@@ -1873,6 +1872,7 @@ required:
18731872
- platform-ui
18741873
- registry
18751874
- release
1875+
- s3proxy
18761876
- selfManagement
18771877
- settings
18781878
- smtprelay

0 commit comments

Comments
 (0)