merge main to current branch

open-telemetry · May 8, 2024 · 73eb99e · 73eb99e
1 parent efd91de
commit 73eb99e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 39 deletions.
diff --git a/bundle/manifests/opentelemetry.io_instrumentations.yaml b/bundle/manifests/opentelemetry.io_instrumentations.yaml
@@ -1040,32 +1040,15 @@ spec:
                     type: string
                 type: object
               selector:
-                description: |-
-                  Selector is the label selector for affected Pods.
-                  This selector only takes effect when annotation: instrumentation.opentelemetry.io/inject-xx equal true.
                 properties:
                   matchExpressions:
-                    description: matchExpressions is a list of label selector requirements.
-                      The requirements are ANDed.
                     items:
-                      description: |-
-                        A label selector requirement is a selector that contains values, a key, and an operator that
-                        relates the key and values.
                       properties:
                         key:
-                          description: key is the label key that the selector applies
-                            to.
                           type: string
                         operator:
-                          description: |-
-                            operator represents a key's relationship to a set of values.
-                            Valid operators are In, NotIn, Exists and DoesNotExist.
                           type: string
                         values:
-                          description: |-
-                            values is an array of string values. If the operator is In or NotIn,
-                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                            the values array must be empty.
                           items:
                             type: string
                           type: array
@@ -1077,7 +1060,6 @@ spec:
                   matchLabels:
                     additionalProperties:
                       type: string
-                    description: matchLabels is a map of {key,value} pairs.
                     type: object
                 type: object
                 x-kubernetes-map-type: atomic

diff --git a/config/crd/bases/opentelemetry.io_instrumentations.yaml b/config/crd/bases/opentelemetry.io_instrumentations.yaml
@@ -1038,32 +1038,15 @@ spec:
                     type: string
                 type: object
               selector:
-                description: |-
-                  Selector is the label selector for affected Pods.
-                  This selector only takes effect when annotation: instrumentation.opentelemetry.io/inject-xx equal true.
                 properties:
                   matchExpressions:
-                    description: matchExpressions is a list of label selector requirements.
-                      The requirements are ANDed.
                     items:
-                      description: |-
-                        A label selector requirement is a selector that contains values, a key, and an operator that
-                        relates the key and values.
                       properties:
                         key:
-                          description: key is the label key that the selector applies
-                            to.
                           type: string
                         operator:
-                          description: |-
-                            operator represents a key's relationship to a set of values.
-                            Valid operators are In, NotIn, Exists and DoesNotExist.
                           type: string
                         values:
-                          description: |-
-                            values is an array of string values. If the operator is In or NotIn,
-                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                            the values array must be empty.
                           items:
                             type: string
                           type: array
@@ -1075,7 +1058,6 @@ spec:
                   matchLabels:
                     additionalProperties:
                       type: string
-                    description: matchLabels is a map of {key,value} pairs.
                     type: object
                 type: object
                 x-kubernetes-map-type: atomic

diff --git a/docs/api.md b/docs/api.md
@@ -184,7 +184,9 @@ Enum=tracecontext;baggage;b3;b3multi;jaeger;xray;ottrace;none<br/>
         <td>object</td>
         <td>
           Selector is the label selector for affected Pods.
-This selector only takes effect when annotation: instrumentation.opentelemetry.io/inject-xx equal true.<br/>
+This selector only takes effect when annotation: instrumentation.opentelemetry.io/inject-xx equal true.
+Unlike standard label selectors, `nil` means `everything`, and this is also the default.
+This may change in a future CRD version.<br/>
         </td>
         <td>false</td>
       </tr></tbody>
@@ -3938,6 +3940,8 @@ The value can be for instance parentbased_always_on, parentbased_always_off, par
 
 Selector is the label selector for affected Pods.
 This selector only takes effect when annotation: instrumentation.opentelemetry.io/inject-xx equal true.
+Unlike standard label selectors, `nil` means `everything`, and this is also the default.
+This may change in a future CRD version.
 
 <table>
     <thead>
@@ -3959,7 +3963,9 @@ This selector only takes effect when annotation: instrumentation.opentelemetry.i
         <td><b>matchLabels</b></td>
         <td>map[string]string</td>
         <td>
-          matchLabels is a map of {key,value} pairs.<br/>
+          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+map is equivalent to an element of matchExpressions, whose key field is "key", the
+operator is "In", and the values array contains only "value". The requirements are ANDed.<br/>
         </td>
         <td>false</td>
       </tr></tbody>
@@ -4004,7 +4010,8 @@ Valid operators are In, NotIn, Exists and DoesNotExist.<br/>
         <td>
           values is an array of string values. If the operator is In or NotIn,
 the values array must be non-empty. If the operator is Exists or DoesNotExist,
-the values array must be empty.<br/>
+the values array must be empty. This array is replaced during a strategic
+merge patch.<br/>
         </td>
         <td>false</td>
       </tr></tbody>