Skip to content

Commit 5ad0079

Browse files
committed
Merge remote-tracking branch 'origin/main' into per-node-strategy
2 parents 8c0f9e6 + c8b2970 commit 5ad0079

23 files changed

+1220
-250
lines changed

.chloggen/fix_ta-serviceaccount.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
5+
component: target allocator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Fix ServiceAccount naming for target allocator
9+
10+
# One or more tracking issues related to the change
11+
issues: [2443]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

.github/workflows/continuous-integration.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858
uses: actions/checkout@v4
5959

6060
- name: Initialize CodeQL
61-
uses: github/codeql-action/init@v2
61+
uses: github/codeql-action/init@v3
6262
with:
6363
languages: go
6464

6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@v2
66+
uses: github/codeql-action/autobuild@v3
6767

6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@v2
69+
uses: github/codeql-action/analyze@v3

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get CA certificates from alpine package repo
2-
FROM alpine:3.18 as certificates
2+
FROM alpine:3.19 as certificates
33

44
RUN apk --no-cache add ca-certificates
55

bundle/manifests/opentelemetry.io_opampbridges.yaml

+147-28
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ spec:
251251
properties:
252252
labelSelector:
253253
description: A label query over a set of resources,
254-
in this case pods.
254+
in this case pods. If it's null, this PodAffinityTerm
255+
matches with no Pods.
255256
properties:
256257
matchExpressions:
257258
description: matchExpressions is a list of label
@@ -295,6 +296,20 @@ spec:
295296
type: object
296297
type: object
297298
x-kubernetes-map-type: atomic
299+
matchLabelKeys:
300+
description: MatchLabelKeys is a set of pod label
301+
keys to select which pods will be taken into consideration.
302+
items:
303+
type: string
304+
type: array
305+
x-kubernetes-list-type: atomic
306+
mismatchLabelKeys:
307+
description: MismatchLabelKeys is a set of pod label
308+
keys to select which pods will be taken into consideration.
309+
items:
310+
type: string
311+
type: array
312+
x-kubernetes-list-type: atomic
298313
namespaceSelector:
299314
description: A label query over the set of namespaces
300315
that the term applies to. The term is applied
@@ -384,7 +399,8 @@ spec:
384399
properties:
385400
labelSelector:
386401
description: A label query over a set of resources,
387-
in this case pods.
402+
in this case pods. If it's null, this PodAffinityTerm
403+
matches with no Pods.
388404
properties:
389405
matchExpressions:
390406
description: matchExpressions is a list of label
@@ -425,6 +441,20 @@ spec:
425441
type: object
426442
type: object
427443
x-kubernetes-map-type: atomic
444+
matchLabelKeys:
445+
description: MatchLabelKeys is a set of pod label keys
446+
to select which pods will be taken into consideration.
447+
items:
448+
type: string
449+
type: array
450+
x-kubernetes-list-type: atomic
451+
mismatchLabelKeys:
452+
description: MismatchLabelKeys is a set of pod label
453+
keys to select which pods will be taken into consideration.
454+
items:
455+
type: string
456+
type: array
457+
x-kubernetes-list-type: atomic
428458
namespaceSelector:
429459
description: A label query over the set of namespaces
430460
that the term applies to. The term is applied to the
@@ -509,7 +539,8 @@ spec:
509539
properties:
510540
labelSelector:
511541
description: A label query over a set of resources,
512-
in this case pods.
542+
in this case pods. If it's null, this PodAffinityTerm
543+
matches with no Pods.
513544
properties:
514545
matchExpressions:
515546
description: matchExpressions is a list of label
@@ -553,6 +584,20 @@ spec:
553584
type: object
554585
type: object
555586
x-kubernetes-map-type: atomic
587+
matchLabelKeys:
588+
description: MatchLabelKeys is a set of pod label
589+
keys to select which pods will be taken into consideration.
590+
items:
591+
type: string
592+
type: array
593+
x-kubernetes-list-type: atomic
594+
mismatchLabelKeys:
595+
description: MismatchLabelKeys is a set of pod label
596+
keys to select which pods will be taken into consideration.
597+
items:
598+
type: string
599+
type: array
600+
x-kubernetes-list-type: atomic
556601
namespaceSelector:
557602
description: A label query over the set of namespaces
558603
that the term applies to. The term is applied
@@ -642,7 +687,8 @@ spec:
642687
properties:
643688
labelSelector:
644689
description: A label query over a set of resources,
645-
in this case pods.
690+
in this case pods. If it's null, this PodAffinityTerm
691+
matches with no Pods.
646692
properties:
647693
matchExpressions:
648694
description: matchExpressions is a list of label
@@ -683,6 +729,20 @@ spec:
683729
type: object
684730
type: object
685731
x-kubernetes-map-type: atomic
732+
matchLabelKeys:
733+
description: MatchLabelKeys is a set of pod label keys
734+
to select which pods will be taken into consideration.
735+
items:
736+
type: string
737+
type: array
738+
x-kubernetes-list-type: atomic
739+
mismatchLabelKeys:
740+
description: MismatchLabelKeys is a set of pod label
741+
keys to select which pods will be taken into consideration.
742+
items:
743+
type: string
744+
type: array
745+
x-kubernetes-list-type: atomic
686746
namespaceSelector:
687747
description: A label query over the set of namespaces
688748
that the term applies to. The term is applied to the
@@ -1909,30 +1969,6 @@ spec:
19091969
description: resources represents the minimum resources
19101970
the volume should have.
19111971
properties:
1912-
claims:
1913-
description: "Claims lists the names of resources,
1914-
defined in spec.resourceClaims, that are used
1915-
by this container. \n This is an alpha field
1916-
and requires enabling the DynamicResourceAllocation
1917-
feature gate."
1918-
items:
1919-
description: ResourceClaim references one
1920-
entry in PodSpec.ResourceClaims.
1921-
properties:
1922-
name:
1923-
description: Name must match the name
1924-
of one entry in pod.spec.resourceClaims
1925-
of the Pod where this field is used.
1926-
It makes that resource available inside
1927-
a container.
1928-
type: string
1929-
required:
1930-
- name
1931-
type: object
1932-
type: array
1933-
x-kubernetes-list-map-keys:
1934-
- name
1935-
x-kubernetes-list-type: map
19361972
limits:
19371973
additionalProperties:
19381974
anyOf:
@@ -2005,6 +2041,11 @@ spec:
20052041
StorageClass required by the claim. More info:
20062042
https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
20072043
type: string
2044+
volumeAttributesClassName:
2045+
description: volumeAttributesClassName may be used
2046+
to set the VolumeAttributesClass used by this
2047+
claim.
2048+
type: string
20082049
volumeMode:
20092050
description: volumeMode defines what type of volume
20102051
is required by the claim. Value of Filesystem
@@ -2351,6 +2392,84 @@ spec:
23512392
description: Projection that may be projected along with
23522393
other supported volume types
23532394
properties:
2395+
clusterTrustBundle:
2396+
description: "ClusterTrustBundle allows a pod to access
2397+
the `.spec.trustBundle` field of ClusterTrustBundle
2398+
objects in an auto-updating file. \n Alpha, gated
2399+
by the ClusterTrustBundleProjection feature gate."
2400+
properties:
2401+
labelSelector:
2402+
description: Select all ClusterTrustBundles that
2403+
match this label selector. Only has effect
2404+
if signerName is set. Mutually-exclusive with
2405+
name. If unset, interpreted as "match nothing".
2406+
properties:
2407+
matchExpressions:
2408+
description: matchExpressions is a list of
2409+
label selector requirements. The requirements
2410+
are ANDed.
2411+
items:
2412+
description: A label selector requirement
2413+
is a selector that contains values, a
2414+
key, and an operator that relates the
2415+
key and values.
2416+
properties:
2417+
key:
2418+
description: key is the label key that
2419+
the selector applies to.
2420+
type: string
2421+
operator:
2422+
description: operator represents a key's
2423+
relationship to a set of values. Valid
2424+
operators are In, NotIn, Exists and
2425+
DoesNotExist.
2426+
type: string
2427+
values:
2428+
description: values is an array of string
2429+
values. If the operator is In or NotIn,
2430+
the values array must be non-empty.
2431+
If the operator is Exists or DoesNotExist,
2432+
the values array must be empty.
2433+
items:
2434+
type: string
2435+
type: array
2436+
required:
2437+
- key
2438+
- operator
2439+
type: object
2440+
type: array
2441+
matchLabels:
2442+
additionalProperties:
2443+
type: string
2444+
description: matchLabels is a map of {key,value}
2445+
pairs.
2446+
type: object
2447+
type: object
2448+
x-kubernetes-map-type: atomic
2449+
name:
2450+
description: Select a single ClusterTrustBundle
2451+
by object name. Mutually-exclusive with signerName
2452+
and labelSelector.
2453+
type: string
2454+
optional:
2455+
description: If true, don't block pod startup
2456+
if the referenced ClusterTrustBundle(s) aren't
2457+
available. If using name, then the named ClusterTrustBundle
2458+
is allowed not to exist.
2459+
type: boolean
2460+
path:
2461+
description: Relative path from the volume root
2462+
to write the bundle.
2463+
type: string
2464+
signerName:
2465+
description: Select all ClusterTrustBundles that
2466+
match this signer name. Mutually-exclusive with
2467+
name. The contents of all selected ClusterTrustBundles
2468+
will be unified and deduplicated.
2469+
type: string
2470+
required:
2471+
- path
2472+
type: object
23542473
configMap:
23552474
description: configMap information about the configMap
23562475
data to project

0 commit comments

Comments
 (0)