Skip to content

Commit

Permalink
Remove revision selector because it's not a string
Browse files Browse the repository at this point in the history
  • Loading branch information
mbbush committed Sep 19, 2023
1 parent 4a6eb32 commit 1a05feb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 123 deletions.
15 changes: 4 additions & 11 deletions apis/kafka/v1beta1/zz_cluster_types.go

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

19 changes: 8 additions & 11 deletions apis/kafka/v1beta1/zz_generated.deepcopy.go

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

18 changes: 0 additions & 18 deletions apis/kafka/v1beta1/zz_generated.resolvers.go

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

4 changes: 0 additions & 4 deletions config/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ func Configure(p *config.Provider) {
Type: "Configuration",
Extractor: common.PathARNExtractor,
}
r.References["configuration_info.revision"] = config.Reference{
Type: "Configuration",
Extractor: `github.com/upbound/upjet/pkg/resource.ExtractParamPath("latest_revision",true)`,
}
r.UseAsync = true
})
}
4 changes: 1 addition & 3 deletions examples/kafka/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ spec:
- arnSelector:
matchLabels:
testing.upbound.io/example-name: example
revisionSelector:
matchLabels:
testing.upbound.io/example-name: example
revision: 1
encryptionInfo:
- encryptionAtRestKmsKeyArnSelector:
matchLabels:
Expand Down
81 changes: 5 additions & 76 deletions package/crds/kafka.aws.upbound.io_clusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -457,82 +457,6 @@ spec:
description: Revision of the MSK Configuration to use in
the cluster.
type: number
revisionRef:
description: Reference to a Configuration to populate revision.
properties:
name:
description: Name of the referenced object.
type: string
policy:
description: Policies for referencing.
properties:
resolution:
default: Required
description: Resolution specifies whether resolution
of this reference is required. The default is
'Required', which means the reconcile will fail
if the reference cannot be resolved. 'Optional'
means this reference will be a no-op if it cannot
be resolved.
enum:
- Required
- Optional
type: string
resolve:
description: Resolve specifies when this reference
should be resolved. The default is 'IfNotPresent',
which will attempt to resolve the reference only
when the corresponding field is not present. Use
'Always' to resolve the reference on every reconcile.
enum:
- Always
- IfNotPresent
type: string
type: object
required:
- name
type: object
revisionSelector:
description: Selector for a Configuration to populate revision.
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
policy:
description: Policies for selection.
properties:
resolution:
default: Required
description: Resolution specifies whether resolution
of this reference is required. The default is
'Required', which means the reconcile will fail
if the reference cannot be resolved. 'Optional'
means this reference will be a no-op if it cannot
be resolved.
enum:
- Required
- Optional
type: string
resolve:
description: Resolve specifies when this reference
should be resolved. The default is 'IfNotPresent',
which will attempt to resolve the reference only
when the corresponding field is not present. Use
'Always' to resolve the reference on every reconcile.
enum:
- Always
- IfNotPresent
type: string
type: object
type: object
type: object
type: array
encryptionInfo:
Expand Down Expand Up @@ -1154,6 +1078,11 @@ spec:
description: Configuration block for specifying a MSK Configuration
to attach to Kafka brokers. See below.
items:
properties:
revision:
description: Revision of the MSK Configuration to use in
the cluster.
type: number
type: object
type: array
encryptionInfo:
Expand Down

0 comments on commit 1a05feb

Please sign in to comment.