Skip to content

adding references to custom resources #18

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

Merged
merged 5 commits into from
Sep 12, 2022
Merged

adding references to custom resources #18

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
b769776
adding references
dalbhanj Sep 9, 2022
8f08a3b
adding references
dalbhanj Sep 9, 2022
7f4a4d4
fixed minor bug with duplicate VirtualClusterId in generator.yaml
dalbhanj Sep 12, 2022
3889bf5
removing recommended-policy-arn
dalbhanj Sep 12, 2022
47a995e
updating code-generator 0.20.1
dalbhanj Sep 12, 2022
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
12 changes: 6 additions & 6 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2022-09-06T12:54:50Z"
build_hash: 585f06bbd6d4cc1b738acb85901e7a009bf452c7
go_version: go1.17.5
version: v0.20.0
api_directory_checksum: bc5fed2df0bfab2a176531654d33d69e8153dc42
build_date: "2022-09-12T20:46:01Z"
build_hash: 2944c8772f216656d84ee02d392eaca501274c1e
go_version: go1.18.1
version: v0.20.1
api_directory_checksum: 2322dd513cbf25a6b2e4b99236b5f3ee0fb8c22e
api_version: v1alpha1
aws_sdk_go_version: v1.42.0
generator_config_info:
file_checksum: 7a666081b91b39305bf1eedcc9cc538703e34948
file_checksum: 8452039ec1ac012add845247a98a2f640647b7b0
original_file_name: generator.yaml
last_modification:
reason: API generation
5 changes: 4 additions & 1 deletion apis/v1alpha1/generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ resources:
fields:
Name:
is_immutable: true
VirtualClusterID:
VirtualClusterId:
is_immutable: true
references:
resource: VirtualCluster
path: Status.ID
ExecutionRoleARN:
is_immutable: true
ReleaseLabel:
Expand Down
4 changes: 2 additions & 2 deletions apis/v1alpha1/job_run.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions apis/v1alpha1/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.

23 changes: 14 additions & 9 deletions config/crd/bases/emrcontainers.services.k8s.aws_jobruns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: jobruns.emrcontainers.services.k8s.aws
spec:
Expand Down Expand Up @@ -73,11 +72,23 @@ spec:
description: The virtual cluster ID for which the job run request
is submitted.
type: string
virtualClusterRef:
description: 'AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference type to provide more user friendly syntax
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
properties:
from:
description: AWSResourceReference provides all the values necessary
to reference another k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
required:
- executionRoleARN
- jobDriver
- releaseLabel
- virtualClusterID
type: object
status:
description: JobRunStatus defines the observed state of JobRun
Expand Down Expand Up @@ -152,9 +163,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions config/crd/bases/emrcontainers.services.k8s.aws_virtualclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: virtualclusters.emrcontainers.services.k8s.aws
spec:
Expand Down Expand Up @@ -147,9 +146,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
4 changes: 0 additions & 4 deletions config/crd/common/bases/services.k8s.aws_fieldexports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ spec:
description: FieldExportTarget provides the values necessary to identify
the output path for a field export.
properties:
key:
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
for the FieldExport target
type: string
kind:
description: FieldExportOutputType represents all types that can
be produced by a field export operation
Expand Down
1 change: 0 additions & 1 deletion config/iam/recommended-policy-arn
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion config/rbac/cluster-role-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down
5 changes: 4 additions & 1 deletion generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@ resources:
fields:
Name:
is_immutable: true
VirtualClusterID:
VirtualClusterId:
is_immutable: true
references:
resource: VirtualCluster
path: Status.ID
ExecutionRoleARN:
is_immutable: true
ReleaseLabel:
Expand Down
23 changes: 14 additions & 9 deletions helm/crds/emrcontainers.services.k8s.aws_jobruns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: jobruns.emrcontainers.services.k8s.aws
spec:
Expand Down Expand Up @@ -73,11 +72,23 @@ spec:
description: The virtual cluster ID for which the job run request
is submitted.
type: string
virtualClusterRef:
description: 'AWSResourceReferenceWrapper provides a wrapper around
*AWSResourceReference type to provide more user friendly syntax
for references using ''from'' field Ex: APIIDRef: from: name: my-api'
properties:
from:
description: AWSResourceReference provides all the values necessary
to reference another k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
required:
- executionRoleARN
- jobDriver
- releaseLabel
- virtualClusterID
type: object
status:
description: JobRunStatus defines the observed state of JobRun
Expand Down Expand Up @@ -152,9 +163,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions helm/crds/emrcontainers.services.k8s.aws_virtualclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: virtualclusters.emrcontainers.services.k8s.aws
spec:
Expand Down Expand Up @@ -147,9 +146,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
10 changes: 2 additions & 8 deletions helm/crds/services.k8s.aws_adoptedresources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: adoptedresources.services.k8s.aws
spec:
Expand Down Expand Up @@ -170,6 +169,7 @@ spec:
- name
- uid
type: object
x-kubernetes-map-type: atomic
type: array
type: object
required:
Expand Down Expand Up @@ -224,9 +224,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
13 changes: 1 addition & 12 deletions helm/crds/services.k8s.aws_fieldexports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: fieldexports.services.k8s.aws
spec:
Expand Down Expand Up @@ -66,10 +65,6 @@ spec:
description: FieldExportTarget provides the values necessary to identify
the output path for a field export.
properties:
key:
description: Key overrides the default value (`<namespace>.<FieldExport-resource-name>`)
for the FieldExport target
type: string
kind:
description: FieldExportOutputType represents all types that can
be produced by a field export operation
Expand Down Expand Up @@ -133,9 +128,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
3 changes: 3 additions & 0 deletions pkg/resource/job_run/delta.go
View file
Open in desktop

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

Loading