Skip to content

Commit 849af0b

Browse files
authored
Merge branch 'master' into change-config-volume-path-for-agent-control
2 parents 6dc4f37 + 41c03e2 commit 849af0b

File tree

21 files changed

+62
-40
lines changed

21 files changed

+62
-40
lines changed

.github/ct-install.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
target-branch: master
2+
13
# In this repository there are two folder with charts that need to be released. One can think that it would be easier to simply at to this file
24
# a chart-dirs clause pointing to both of the folders at the same time:
35

.github/ct-lint.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
target-branch: master
2+
13
# In this repository there are two folder with charts that need to be released. One can think that it would be easier to simply at to this file
24
# a chart-dirs clause pointing to both of the folders at the same time:
35

.github/workflows/agent-control-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Minikube
3030
uses: manusa/[email protected]
3131
with:
32-
minikube version: v1.35.0
32+
minikube version: v1.37.0
3333
kubernetes version: "v1.30.14"
3434
start args: '--cni=calico'
3535
driver: docker

.github/workflows/lint_test_charts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- uses: actions/setup-python@v5
32-
- uses: helm/chart-testing-action@v2.6.1
32+
- uses: helm/chart-testing-action@v2.7.0
3333
- uses: azure/setup-helm@v4
3434
with:
3535
version: 'v3.2.0'
@@ -73,7 +73,7 @@ jobs:
7373
fetch-depth: 0
7474

7575
- uses: actions/setup-python@v5
76-
- uses: helm/chart-testing-action@v2.6.1
76+
- uses: helm/chart-testing-action@v2.7.0
7777
- uses: azure/setup-helm@v4
7878
with:
7979
version: 'v3.2.0'

charts/agent-control-bootstrap/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: agent-control-bootstrap
33
description: Bootstraps New Relic' Agent Control
44

55
type: application
6-
version: 1.0.2
6+
version: 1.0.3
77
# agent-control-deployment chart default version.
8-
appVersion: 1.0.1
8+
appVersion: 1.0.3
99
annotations:
1010
# agent-control-cd chart default version.
1111
agentControlCdVersion: 1.0.0

charts/agent-control-deployment/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: A Helm chart to install New Relic Agent Control on Kubernetes
44

55
type: application
66

7-
version: 1.0.2
8-
appVersion: "1.0.0"
7+
version: 1.0.3
8+
appVersion: "1.1.0"
99

1010
dependencies:
1111
- name: common-library

charts/nr-k8s-otel-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type: application
1717
# This is the chart version. This version number should be incremented each time you make changes
1818
# to the chart and its templates, including the app version.
1919
# Versions are expected to follow Semantic Versioning (https://semver.org/)
20-
version: 0.8.50
20+
version: 0.8.51
2121

2222
dependencies:
2323
- name: common-library

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/name: nr-k8s-otel-collector
1111
app.kubernetes.io/version: 1.2.0
12-
helm.sh/chart: nr-k8s-otel-collector-0.8.50
12+
helm.sh/chart: nr-k8s-otel-collector-0.8.51
1313
rules:
1414
- apiGroups:
1515
- ""

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/name: nr-k8s-otel-collector
1111
app.kubernetes.io/version: 1.2.0
12-
helm.sh/chart: nr-k8s-otel-collector-0.8.50
12+
helm.sh/chart: nr-k8s-otel-collector-0.8.51
1313
subjects:
1414
- kind: ServiceAccount
1515
name: nr-k8s-otel-collector

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/name: nr-k8s-otel-collector
1212
app.kubernetes.io/version: 1.2.0
13-
helm.sh/chart: nr-k8s-otel-collector-0.8.50
13+
helm.sh/chart: nr-k8s-otel-collector-0.8.51
1414
data:
1515
daemonset-config.yaml: |
1616
receivers:
@@ -558,7 +558,7 @@ data:
558558
value: <cluser_name>
559559
- key: "newrelic.chart.version"
560560
action: upsert
561-
value: 0.8.50
561+
value: 0.8.51
562562
- key: newrelic.entity.type
563563
action: upsert
564564
value: "k8s"

0 commit comments

Comments
 (0)