Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Horiodino committed Jan 15, 2024
2 parents 886da91 + d013d45 commit 6067480
Show file tree
Hide file tree
Showing 228 changed files with 10,576 additions and 4,438 deletions.
16 changes: 0 additions & 16 deletions .chloggen/2364-foreground-delete.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ change_type: enhancement
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: added reconciliation errors for CRD events
note: Automate the creation of the permissions needed by the resourcedetection processor

# One or more tracking issues related to the change
issues: [1972]
issues: [2393]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ change_type: enhancement
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add liveness probe to target allocator deployment generation
note: Automate the creation of the permissions needed by the k8sattributes processor

# One or more tracking issues related to the change
issues: [2258]
issues: [2395]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ change_type: enhancement
component: target allocator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add readyz endpoint to TA
note: Change default allocation and filtering strategy

# One or more tracking issues related to the change
issues: [2258]
issues: [2477]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
subtext:
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ change_type: enhancement
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: add readiness probe to target allocator deployment generation
note: Introduce common fields to the v1alpha2 types that can be reused for any CRDs.

# One or more tracking issues related to the change
issues: [2258]
issues: [901]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
Expand Down
18 changes: 18 additions & 0 deletions .chloggen/feat_targetallocator-selector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
component: target allocator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Use standard K8s label selectors for collectors in target allocator config

# One or more tracking issues related to the change
issues: [2422]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
This is a breaking change only for users of standalone target allocator. Operator users are unaffected.
The operator is still compatible with previous target allocator versions, and will be for the next 3 releases.
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ change_type: enhancement
component: target allocator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Use only target address for allocation in consistent-hashing strategy
note: Use Pod securityContext for target allocator

# One or more tracking issues related to the change
issues: [2280]
issues: [2495]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
subtext: Bring back PodSecurityContext as it was removed in the previous changes.
8 changes: 4 additions & 4 deletions ...llocator-delayed-collector-instances.yaml → .chloggen/fix-ta-security-context.yaml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
component: target allocator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Save targets discovered before collector instances come up
note: Use container securityContext for target allocator

# One or more tracking issues related to the change
issues: [2350]
issues: [2490]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
subtext: This is really a bug fix, as the current behaviour is not intended. We've marked it as breaking in case anyone started depending on it.
16 changes: 0 additions & 16 deletions .chloggen/issue-2366-fix.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions .chloggen/main.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions .chloggen/.bump-dotnet-1.2.0.yaml → .chloggen/pods-in-bridge-message.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
component: autoinstrumentation
component: bridge

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Bump OpenTelemetry .NET Automatic Instrumentation to 1.2.0
note: Sets pods in the component health map

# One or more tracking issues related to the change
issues: [2382]
issues: [2489]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
subtext: this change adds a requirement for a new permission for the bridge to list and get pods.
16 changes: 0 additions & 16 deletions .chloggen/sa-fix.yaml

This file was deleted.

44 changes: 2 additions & 42 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,6 @@ updates:
schedule:
interval: daily
# Create a group of dependencies to be updated together in one pull request
groups:
golang-org-x:
patterns:
- "golang.org/x/*"
prometheus:
patterns:
- "github.com/prometheus-operator/prometheus-operator"
- "github.com/prometheus-operator/prometheus-operator/*"
- "github.com/prometheus/prometheus"
- "github.com/prometheus/prometheus/*"
- "github.com/prometheus/client_go"
- "github.com/prometheus/client_go/*"
kubernetes:
patterns:
- "k8s.io/*"
- "sigs.k8s.io/*"
- package-ecosystem: gomod
directory: /cmd/operator-opamp-bridge
schedule:
interval: daily
groups:
golang-org-x:
patterns:
Expand All @@ -43,28 +23,8 @@ updates:
- "sigs.k8s.io/*"
otel:
patterns:
- go.opentelemetry.io/otel
- go.opentelemetry.io/otel/*
- package-ecosystem: gomod
directory: /cmd/otel-allocator
schedule:
interval: daily
groups:
golang-org-x:
patterns:
- "golang.org/x/*"
prometheus:
patterns:
- "github.com/prometheus-operator/prometheus-operator"
- "github.com/prometheus-operator/prometheus-operator/*"
- "github.com/prometheus/prometheus"
- "github.com/prometheus/prometheus/*"
- "github.com/prometheus/client_go"
- "github.com/prometheus/client_go/*"
kubernetes:
patterns:
- "k8s.io/*"
- "sigs.k8s.io/*"
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/*"

- package-ecosystem: github-actions
directory: /
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"

Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,28 @@ jobs:
name: Unit tests
runs-on: ubuntu-22.04
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: "~1.21.1"

- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: "basic checks"
run: make ci

lint:
name: Code standards (linting)
runs-on: ubuntu-22.04
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "~1.21.1"
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- uses: actions/cache@v3
with:
Expand All @@ -58,12 +59,12 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: go

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
25 changes: 14 additions & 11 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

jobs:
e2e-tests:
name: End-to-end tests
name: End-to-end tests ${{ matrix.group }} on K8s ${{ matrix.kube-version }}
runs-on: ubuntu-22.04
strategy:
fail-fast: false
Expand All @@ -21,30 +21,31 @@ jobs:
# All Kubernetes version in between expose the same APIs, hence the operator
# should be compatible with them.
kube-version:
- "1.23"
- "1.28"
- "1.23"
- "1.29"
group:
- e2e
- e2e-instrumentation
- e2e-upgrade
- e2e-prometheuscr
- e2e-autoscale
- e2e-multi-instrumentation
- e2e-pdb
- e2e-opampbridge
- e2e-prometheuscr
- e2e-multi-instrumentation
include:
- group: e2e-prometheuscr
setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"
- group: e2e-multi-instrumentation
setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.autoinstrumentation.multi-instrumentation"

steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "~1.21.3"
cache-dependency-path: |
go.sum
cmd/otel-allocator/go.sum
cmd/operator-opamp-bridge/go.sum

- name: Setup kind
env:
Expand All @@ -57,7 +58,9 @@ jobs:
- name: "run tests"
env:
KUBE_VERSION: ${{ matrix.kube-version }}
run: make prepare-e2e ${{ matrix.group }} KUBE_VERSION=$KUBE_VERSION VERSION=e2e
run: |
make ${{ matrix.setup != '' && matrix.setup || 'prepare-e2e' }} KUBE_VERSION=$KUBE_VERSION VERSION=e2e
make ${{ matrix.group }}
- name: "log operator if failed"
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '~1.21.3'

Expand Down
Loading

0 comments on commit 6067480

Please sign in to comment.