Skip to content

Commit 62d4880

Browse files
chore(gateway): update chart location (#1172)
1 parent 60680e2 commit 62d4880

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

agent-control/agent-type-registry/newrelic/pipeline-control-gateway-0.1.0.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ version: 0.1.0
44
variables:
55
k8s:
66
chart_values:
7-
# TODO once available in the newrelic repository review the chart name
8-
gateway:
7+
pipeline-control-gateway:
98
description: "Gateway chart values"
109
type: yaml
1110
required: false
@@ -36,8 +35,7 @@ deployment:
3635
# delaying the application of important updates.
3736
interval: 30m
3837
provider: generic
39-
# TODO point to the newrelic repository once available
40-
url: https://rnoothi.github.io/foobar
38+
url: https://helm-charts.newrelic.com
4139
default-values:
4240
apiVersion: v1
4341
kind: Secret
@@ -60,7 +58,7 @@ deployment:
6058
stringData:
6159
# global values defined inside here will have less precedence than the ones defined in `chart_values.global`
6260
values.yaml: |
63-
${nr-var:chart_values.gateway}
61+
${nr-var:chart_values.pipeline-control-gateway}
6462
release:
6563
apiVersion: helm.toolkit.fluxcd.io/v2
6664
kind: HelmRelease
@@ -70,7 +68,7 @@ deployment:
7068
interval: 3m
7169
chart:
7270
spec:
73-
chart: gateway
71+
chart: pipeline-control-gateway
7472
version: ${nr-var:chart_version}
7573
reconcileStrategy: ChartVersion
7674
sourceRef:

test/k8s-e2e/agent-control-fleet-control.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ agent-control-deployment:
99
auth:
1010
secret:
1111
create: false
12-
name: "sys-identity"
12+
name: "sys-identity"
1313
agentControl:
1414
content:
1515
log:
@@ -24,7 +24,3 @@ agent-control-deployment:
2424
customAttributes:
2525
cluster_name: ${nr-env:NR_CLUSTER_NAME}
2626
config_origin: local
27-
nri-metadata-injection:
28-
# TODO we are currently disabling the metadata injection since if enabled it breaks when installed
29-
# together with the gateway
30-
enabled: false

test/k8s-e2e/agent-control-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ agent-control-deployment:
2929
type: newrelic/io.fluentbit:0.1.0
3030
content:
3131
chart_version: "*" # Use latest
32-
gateway:
32+
pipeline-control-gateway:
3333
type: newrelic/com.newrelic.pipeline_control_gateway:0.1.0
3434
content:
3535
chart_version: "*" # Use latest
3636
chart_values:
3737
# we override resources since to fit in the small ci/cd minikube
38-
gateway:
38+
pipeline-control-gateway:
3939
# TODO we are currently not testing the gateway behaviour, only that the chart is deployed
4040
# For this reason we are blocking the creation of pods
4141
customSecretName: "not-existing"

test/k8s-e2e/e2e-infra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ scenarios:
2626
# Check that newrelic-infrastructure data is reported, an extra where testKey=$SCENARIO_TAG is always added.
2727
- query: "FROM K8sClusterSample SELECT *"
2828
# Check that gateway is up and running, an extra where testKey=$SCENARIO_TAG is always added.
29-
- query: "FROM K8sDeploymentSample SELECT * where deploymentName = 'gateway-deployment'"
29+
- query: "FROM K8sDeploymentSample SELECT * where deploymentName = 'pipeline-control-gateway'"

0 commit comments

Comments
 (0)