From 9d3bb04390c0a745b780ed7a994a3b45b22e7a63 Mon Sep 17 00:00:00 2001 From: ezgidemirel Date: Tue, 27 Dec 2022 14:51:56 +0300 Subject: [PATCH] Add store config scheme Signed-off-by: ezgidemirel --- apis/v1alpha1/doc.go | 2 +- apis/v1alpha1/types.go | 4 ++-- apis/zz_register.go | 2 ++ config/provider.go | 1 + package/crds/aws.upbound.io_storeconfigs.yaml | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apis/v1alpha1/doc.go b/apis/v1alpha1/doc.go index 2bad9ad8c5..420315ee70 100644 --- a/apis/v1alpha1/doc.go +++ b/apis/v1alpha1/doc.go @@ -2,7 +2,7 @@ Copyright 2021 Upbound Inc. */ -// Package v1alpha1 contains the core resources of the aws jet provider. +// Package v1alpha1 contains the core resources of the aws provider. // +kubebuilder:object:generate=true // +groupName=aws.upbound.io // +versionName=v1alpha1 diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go index a8cab4110a..c7dd7dcbee 100644 --- a/apis/v1alpha1/types.go +++ b/apis/v1alpha1/types.go @@ -22,11 +22,11 @@ type StoreConfigStatus struct { // +kubebuilder:object:root=true -// A StoreConfig configures how GCP controller should store connection details. +// A StoreConfig configures how AWS controller should store connection details. // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:printcolumn:name="TYPE",type="string",JSONPath=".spec.type" // +kubebuilder:printcolumn:name="DEFAULT-SCOPE",type="string",JSONPath=".spec.defaultScope" -// +kubebuilder:resource:scope=Cluster,categories={crossplane,store,gcp} +// +kubebuilder:resource:scope=Cluster,categories={crossplane,store,aws} // +kubebuilder:subresource:status type StoreConfig struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/zz_register.go b/apis/zz_register.go index b0c4aafa73..48f6435739 100755 --- a/apis/zz_register.go +++ b/apis/zz_register.go @@ -132,6 +132,7 @@ import ( v1beta1sqs "github.com/upbound/provider-aws/apis/sqs/v1beta1" v1beta1ssm "github.com/upbound/provider-aws/apis/ssm/v1beta1" v1beta1transfer "github.com/upbound/provider-aws/apis/transfer/v1beta1" + v1alpha1 "github.com/upbound/provider-aws/apis/v1alpha1" v1beta1apis "github.com/upbound/provider-aws/apis/v1beta1" ) @@ -260,6 +261,7 @@ func init() { v1beta1sqs.SchemeBuilder.AddToScheme, v1beta1ssm.SchemeBuilder.AddToScheme, v1beta1transfer.SchemeBuilder.AddToScheme, + v1alpha1.SchemeBuilder.AddToScheme, v1beta1apis.SchemeBuilder.AddToScheme, ) } diff --git a/config/provider.go b/config/provider.go index e24e7b3ce6..a85986eae7 100644 --- a/config/provider.go +++ b/config/provider.go @@ -93,6 +93,7 @@ var ( var ( BasePackages = config.BasePackages{ APIVersion: []string{ + "apis/v1alpha1", "apis/v1beta1", }, Controller: []string{ diff --git a/package/crds/aws.upbound.io_storeconfigs.yaml b/package/crds/aws.upbound.io_storeconfigs.yaml index 0c14284760..c98ff3ae57 100644 --- a/package/crds/aws.upbound.io_storeconfigs.yaml +++ b/package/crds/aws.upbound.io_storeconfigs.yaml @@ -12,7 +12,7 @@ spec: categories: - crossplane - store - - gcp + - aws kind: StoreConfig listKind: StoreConfigList plural: storeconfigs @@ -32,7 +32,7 @@ spec: name: v1alpha1 schema: openAPIV3Schema: - description: A StoreConfig configures how GCP controller should store connection + description: A StoreConfig configures how AWS controller should store connection details. properties: apiVersion: