Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[agent-control] update system identity creation query #1587

Merged
merged 3 commits into from
Feb 17, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/agent-control/Chart.lock
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@ dependencies:
version: 2.14.1
- name: agent-control-deployment
repository: ""
version: 0.0.38-beta
version: 0.0.39-beta
- name: common-library
repository: https://helm-charts.newrelic.com
version: 1.3.1
digest: sha256:019231eb161875b7b8c4b5ee671d993eae2585d88bab871cc9123690b1665241
generated: "2025-02-12T17:34:42.67612+01:00"
digest: sha256:9f32bf1c7e1c5e5fe4bf0ca1d48ee89155816667971393d7d9ad147dc8bb7768
generated: "2025-02-17T08:34:45.995478+01:00"
4 changes: 2 additions & 2 deletions charts/agent-control/Chart.yaml
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@ name: agent-control
description: Bootstraps New Relic' Agent Control

type: application
version: 0.0.47-beta
version: 0.0.48-beta

dependencies:
- name: flux2
repository: https://fluxcd-community.github.io/helm-charts
version: 2.14.1
condition: flux2.enabled
- name: agent-control-deployment
version: 0.0.38-beta
version: 0.0.39-beta
condition: agent-control-deployment.enabled
# The following dependency is needed as sub-dependency of agent-control-deployment
- name: common-library
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ description: A Helm chart to install New Relic Agent Control on Kubernetes

type: application

version: 0.0.38-beta
version: 0.0.39-beta

keywords:
- newrelic
Original file line number Diff line number Diff line change
@@ -316,11 +316,11 @@ Return to which endpoint should the agent control register its system identity
{{- $region := include "newrelic.common.region" . -}}

{{- if eq $region "Staging" -}}
https://ng-iam-service.staging-service.nr-ops.net/system-identity/graphql
https://staging-api.newrelic.com/graphql
{{- else if eq $region "EU" -}}
https://ng-iam-service.service.eu.nr-ops.net/system-identity/graphql
https://api.eu.newrelic.com/graphql
{{- else if eq $region "US" -}}
https://ng-iam-service.service.nr-ops.net/system-identity/graphql
https://api.newrelic.com/graphql
{{- else if eq $region "Local" -}}
{{- /* Accessing the value directly without protection. A developer should now how to read the error. */ -}}
{{ .Values.development.backend.systemIdentityCreation }}
Original file line number Diff line number Diff line change
@@ -164,7 +164,7 @@ spec:
for RETRY in 1 2 3; do
HTTP_CODE=$(echo '{ "query":
"mutation {
create(
systemIdentityCreate(
name: \"'$NAME'\",
organizationId: \"{{ include "newrelic-agent-control.auth.organizationId" . }}\",
publicKey: \"'$(openssl enc -base64 -A -in "$TEMPORAL_FOLDER/pub")'\"
@@ -217,7 +217,7 @@ spec:
fi
fi

CLIENT_ID=$(jq '.data.create.clientId' < "$TEMPORAL_FOLDER/response.json" | tr -d '"' )
CLIENT_ID=$(jq '.data.systemIdentityCreate.clientId' < "$TEMPORAL_FOLDER/response.json" | tr -d '"' )
else
echo Starting with Legacy UserApiKey System Identity...
############################################################