Skip to content

Commit

Permalink
Add field Subscription.Spec.Config.Annotations (#312)
Browse files Browse the repository at this point in the history
* Add field Subscription.Spec.Config.DeploymentAnnotations

* Use deploymentAnnotations over deployment_annotations

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>

* Clarify DeploymentAnnotations doc string and regen files

* Rename SubscriptionConfig.DeploymentAnnotations to SubscriptionConfig.Annotations

---------

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>
  • Loading branch information
cognifloyd and joelanford committed Jan 27, 2024
1 parent 75b2af0 commit 0eaaa1f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
5 changes: 5 additions & 0 deletions crds/operators.coreos.com_subscriptions.yaml
Expand Up @@ -524,6 +524,11 @@ spec:
topologyKey:
description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
type: string
annotations:
description: Annotations is an unstructured key value map stored with each Deployment, Pod, APIService in the Operator. Typically, annotations may be set by external tools to store and retrieve arbitrary metadata. Use this field to pre-define annotations that OLM should add to each of the Subscription's deployments, pods, and apiservices.
type: object
additionalProperties:
type: string
env:
description: Env is a list of environment variables to set in the container. Cannot be updated.
type: array
Expand Down
2 changes: 1 addition & 1 deletion crds/zz_defs.go

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions pkg/operators/v1alpha1/subscription_types.go
Expand Up @@ -90,6 +90,13 @@ type SubscriptionConfig struct {
// Use empty object ({}) to erase original sub-attribute values.
// +optional
Affinity *corev1.Affinity `json:"affinity,omitempty" protobuf:"bytes,18,opt,name=affinity"`

// Annotations is an unstructured key value map stored with each Deployment, Pod, APIService in the Operator.
// Typically, annotations may be set by external tools to store and retrieve arbitrary metadata.
// Use this field to pre-define annotations that OLM should add to each of the Subscription's
// deployments, pods, and apiservices.
// +optional
Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,12,rep,name=annotations"`
}

// SubscriptionConditionType indicates an explicit state condition about a Subscription in "abnormal-true"
Expand Down
7 changes: 7 additions & 0 deletions pkg/operators/v1alpha1/zz_generated.deepcopy.go

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

0 comments on commit 0eaaa1f

Please sign in to comment.