Merge pull request #1157 from haarchri/feature/ec2-ebs-kms-ref-selector

feat(ec2): add kmsKeyID Ref & Selector in ec2-instance ebs dbm
crossplane-contrib · Mar 8, 2022 · 4651608 · 4651608
2 parents f1fbca2 + 410704d
commit 4651608
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 0 deletions.
diff --git a/apis/ec2/manualv1alpha1/common.go b/apis/ec2/manualv1alpha1/common.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	awsclients "github.com/crossplane/provider-aws/pkg/clients"
@@ -178,8 +179,19 @@ type EBSBlockDevice struct {
 	// RunInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html),
 	// RequestSpotFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html),
 	// and RequestSpotInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html).
+	// +crossplane:generate:reference:type=github.com/crossplane/provider-aws/apis/kms/v1alpha1.Key
+	// +crossplane:generate:reference:refFieldName=KMSKeyIDRef
+	// +crossplane:generate:reference:selectorFieldName=KMSKeyIDSelector
 	KmsKeyID *string `json:"kmsKeyId,omitempty"`
 
+	// KMSKeyIDRef is a reference to a KMS Key used to set KMSKeyID.
+	// +optional
+	KMSKeyIDRef *xpv1.Reference `json:"kmsKeyIdRef,omitempty"`
+
+	// KMSKeyIDSelector selects a reference to a KMS Key used to set KMSKeyID.
+	// +optional
+	KMSKeyIDSelector *xpv1.Selector `json:"kmsKeyIdSelector,omitempty"`
+
 	// The ID of the snapshot.
 	SnapshotID *string `json:"snapshotId,omitempty"`
 

diff --git a/apis/ec2/manualv1alpha1/zz_generated.deepcopy.go b/apis/ec2/manualv1alpha1/zz_generated.deepcopy.go
diff --git a/apis/ec2/manualv1alpha1/zz_generated.resolvers.go b/apis/ec2/manualv1alpha1/zz_generated.resolvers.go
diff --git a/package/crds/ec2.aws.crossplane.io_instances.yaml b/package/crds/ec2.aws.crossplane.io_instances.yaml
@@ -155,6 +155,32 @@ spec:
                                 RequestSpotFleet (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html),
                                 and RequestSpotInstances (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html)."
                               type: string
+                            kmsKeyIdRef:
+                              description: KMSKeyIDRef is a reference to a KMS Key
+                                used to set KMSKeyID.
+                              properties:
+                                name:
+                                  description: Name of the referenced object.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            kmsKeyIdSelector:
+                              description: KMSKeyIDSelector selects a reference to
+                                a KMS Key used to set KMSKeyID.
+                              properties:
+                                matchControllerRef:
+                                  description: MatchControllerRef ensures an object
+                                    with the same controller reference as the selecting
+                                    object is selected.
+                                  type: boolean
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: MatchLabels ensures an object with
+                                    matching labels is selected.
+                                  type: object
+                              type: object
                             snapshotId:
                               description: The ID of the snapshot.
                               type: string