Skip to content

imageresitry support Alibabacloud oss #1004

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

Closed
menglingwei wants to merge 5 commits into from
Closed

imageresitry support Alibabacloud oss #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
727affe
imageresitry support Alibabacloud oss
Sep 8, 2021
20c4927
imageresitry support Alibabacloud oss
Sep 8, 2021
30832b1
Merge branch 'master' of https://github.com/menglingwei/api
Sep 10, 2021
54b7795
Merge branch 'openshift:master' into master
menglingwei Sep 10, 2021
274ec5d
Merge branch 'master' of https://github.com/menglingwei/api
Sep 10, 2021
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
118 changes: 59 additions & 59 deletions authorization/v1/generated.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions imageregistry/v1/00-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,28 @@ spec:
description: managementState indicates if the operator manages the underlying storage unit. If Managed the operator will remove the storage when this operator gets Removed.
type: string
pattern: ^(Managed|Unmanaged)$
oss:
description: OSS represents configuration that uses Alibaba Cloud Object Storage.
type: object
properties:
bucket:
description: bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.
type: string
encrypt:
description: encrypt specifies whether the registry stores the image in encrypted format or not. Optional, defaults to false.
type: boolean
internal:
description: internal specifies whether the registry use the OSS VPC internal endpoint Optional, defaults to false. if RegionEndpoint is specified, this config will be ignored
type: boolean
keyID:
description: keyID is the KMS key ID to use for encryption. Optional, Encrypt must be true, or this parameter is ignored.
type: string
region:
description: region is the GCS location in which your bucket exists. Optional, will be set based on the installed GCS Region.
type: string
regionEndpoint:
description: regionEndpoint is the endpoint for S3 compatible storage services. Optional, defaults based on the Region that is provided.
type: string
pvc:
description: pvc represents configuration that uses a PersistentVolumeClaim.
type: object
Expand Down Expand Up @@ -949,6 +971,28 @@ spec:
description: managementState indicates if the operator manages the underlying storage unit. If Managed the operator will remove the storage when this operator gets Removed.
type: string
pattern: ^(Managed|Unmanaged)$
oss:
description: OSS represents configuration that uses Alibaba Cloud Object Storage.
type: object
properties:
bucket:
description: bucket is the bucket name in which you want to store the registry's data. Optional, will be generated if not provided.
type: string
encrypt:
description: encrypt specifies whether the registry stores the image in encrypted format or not. Optional, defaults to false.
type: boolean
internal:
description: internal specifies whether the registry use the OSS VPC internal endpoint Optional, defaults to false. if RegionEndpoint is specified, this config will be ignored
type: boolean
keyID:
description: keyID is the KMS key ID to use for encryption. Optional, Encrypt must be true, or this parameter is ignored.
type: string
region:
description: region is the GCS location in which your bucket exists. Optional, will be set based on the installed GCS Region.
type: string
regionEndpoint:
description: regionEndpoint is the endpoint for S3 compatible storage services. Optional, defaults based on the Region that is provided.
type: string
pvc:
description: pvc represents configuration that uses a PersistentVolumeClaim.
type: object
Expand Down
33 changes: 33 additions & 0 deletions imageregistry/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,36 @@ type ImageRegistryConfigStorageIBMCOS struct {
ServiceInstanceCRN string `json:"serviceInstanceCRN,omitempty"`
}

// ImageRegistryConfigStorageOSS holds Alibaba Cloud OSS configuration.
type ImageRegistryConfigStorageOSS struct {
// bucket is the bucket name in which you want to store the registry's
// data.
// Optional, will be generated if not provided.
// +optional
Bucket string `json:"bucket,omitempty"`
// region is the GCS location in which your bucket exists.
// Optional, will be set based on the installed GCS Region.
// +optional
Region string `json:"region,omitempty"`
// regionEndpoint is the endpoint for S3 compatible storage services.
// Optional, defaults based on the Region that is provided.
// +optional
RegionEndpoint string `json:"regionEndpoint,omitempty"`
// internal specifies whether the registry use the OSS VPC internal endpoint
// Optional, defaults to false. if RegionEndpoint is specified, this config will be ignored
// +optional
Internal bool `json:"internal,omitempty"`
// encrypt specifies whether the registry stores the image in encrypted
// format or not.
// Optional, defaults to false.
// +optional
Encrypt bool `json:"encrypt,omitempty"`
// keyID is the KMS key ID to use for encryption.
// Optional, Encrypt must be true, or this parameter is ignored.
// +optional
KeyID string `json:"keyID,omitempty"`
}

// ImageRegistryConfigStorage describes how the storage should be configured
// for the image registry.
type ImageRegistryConfigStorage struct {
Expand Down Expand Up @@ -333,6 +363,9 @@ type ImageRegistryConfigStorage struct {
// ibmcos represents configuration that uses IBM Cloud Object Storage.
// +optional
IBMCOS *ImageRegistryConfigStorageIBMCOS `json:"ibmcos,omitempty"`
// OSS represents configuration that uses Alibaba Cloud Object Storage.
// +optional
OSS *ImageRegistryConfigStorageOSS `json:"oss,omitempty"`
// managementState indicates if the operator manages the underlying
// storage unit. If Managed the operator will remove the storage when
// this operator gets Removed.
Expand Down
21 changes: 21 additions & 0 deletions imageregistry/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading