Skip to content
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.

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

Add field Subscription.Spec.Config.Annotations #312

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions crds/operators.coreos.com_subscriptions.yaml
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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.