Cr group kind fixes #879
Merged
Cr group kind fixes #879
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timothysmith0609
requested review from
JamesOwenHall and
camteasdale143
and removed request for
a team
timothysmith0609
commented
Mar 9, 2022
| @@ -74,7 +74,7 @@ def predeploy_sequence | |||
| Pod | |||
| ).map { |r| [r, default_group] } | |||
|
|
|||
| crs = cluster_resource_discoverer.crds.select(&:predeployed?).map { |cr| [cr.kind, { group: cr.group }] } | |||
| crs = cluster_resource_discoverer.crds.select(&:predeployed?).map { |cr| [cr.group_kind, { group: cr.group }] } | |||
There was a problem hiding this comment.
the redundancy of duplicating group information makes this fix much easier to implement, and is really just an internal consideration, anyway, so it felt like it was worth it.
| @@ -241,7 +241,7 @@ def discover_resources | |||
| crds_by_group_kind = cluster_resource_discoverer.crds.group_by(&:group_kind) | |||
| @template_sets.with_resource_definitions(current_sha: @current_sha, bindings: @bindings) do |r_def| | |||
| group, kind = group_kind_for_r_def(r_def) | |||
| crd = crds_by_group_kind[group + "/" + kind]&.first | |||
| crd = crds_by_group_kind["#{kind}.#{group}"]&.first | |||
There was a problem hiding this comment.
I've adopted the convention of displaying group-kind information as $KIND.$GROUP, which mirrors how tools like kubectl, etc. work. e.g. deployments.apps
| @@ -96,6 +96,7 @@ def test_cr_instance_fails_validation_when_rollout_conditions_for_crd_invalid | |||
| logger: @logger, statsd_tags: @statsd_tags, crd: crd, | |||
| definition: { | |||
| "kind" => "UnitTest", | |||
| "apiVersion" => "stable.example.io/v1", | |||
There was a problem hiding this comment.
apiVersion is required of any k8s resource, so it makes more sense to add it here than try to code around its absence
arunikadhal
approved these changes
Mar 10, 2022
timothysmith0609
merged commit 2c7fafd
into
grouping_cluster_resources_by_group_and_kind
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are you trying to accomplish with this PR?
Fixes the problem whereby custom resources can not discriminate between the same kind in different groups. This actually involved changes to
#predeploy_sequenceandCustomResource(Definition)Note this doesn't solve the wider problem of multiple kinds among different standard API groups: that will require more changes than what's here