Rename SubscriptionConfig.DeploymentAnnotations to SubscriptionConfig…

….Annotations
operator-framework · Jan 27, 2024 · 915b186 · 915b186
1 parent 60fbe24
commit 915b186
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/crds/operators.coreos.com_subscriptions.yaml b/crds/operators.coreos.com_subscriptions.yaml
@@ -524,8 +524,8 @@ 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
-                    deploymentAnnotations:
-                      description: DeploymentAnnotations is an unstructured key value map stored with each Deployment 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.
+                    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

diff --git a/crds/zz_defs.go b/crds/zz_defs.go
diff --git a/pkg/operators/v1alpha1/subscription_types.go b/pkg/operators/v1alpha1/subscription_types.go
@@ -91,11 +91,12 @@ type SubscriptionConfig struct {
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty" protobuf:"bytes,18,opt,name=affinity"`
 
-	// DeploymentAnnotations is an unstructured key value map stored with each Deployment in the Operator.
+	// 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.
+	// Use this field to pre-define annotations that OLM should add to each of the Subscription's
+	// deployments, pods, and apiservices.
 	// +optional
-	DeploymentAnnotations map[string]string `json:"deploymentAnnotations,omitempty" protobuf:"bytes,12,rep,name=deploymentAnnotations"`
+	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"

diff --git a/pkg/operators/v1alpha1/zz_generated.deepcopy.go b/pkg/operators/v1alpha1/zz_generated.deepcopy.go