Skip to content

Commit 85e9028

Browse files
wallrj-cyberarkwallrj-cyberark
committed
Rename cyberark-disco-agent to disco-agent across repo
- Rename Helm chart directory and files to deploy/charts/disco-agent - Update image and chart repository names in makefiles and release docs - Adjust test scripts, telemetry identifier, and selection labels - Regenerate docs/schema and update snapshots for new chart name - Users must pull quay.io/jetstack/disco-agent and charts/disco-agent BREAKING CHANGE: image and Helm chart renamed from cyberark-disco-agent to disco-agent; update any scripts, manifests, and references Signed-off-by: Richard Wall <[email protected]>
1 parent ee43b0b commit 85e9028

23 files changed

+84
-84
lines changed

‎RELEASE.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ The release process is semi-automated.
1212
> Upon pushing the tag, a GitHub Action will do the following:
1313
> - Build and publish the container image: `quay.io/jetstack/venafi-agent`,
1414
> - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/venafi-kubernetes-agent`,
15-
> - Build and publish the container image: `quay.io/jetstack/cyberark-disco-agent`,
16-
> - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/cyberark-disco-agent`,
15+
> - Build and publish the container image: `quay.io/jetstack/disco-agent`,
16+
> - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/disco-agent`,
1717
> - Create a draft GitHub release,
1818
1919
1. Upgrade the Go dependencies.
@@ -75,7 +75,7 @@ For context, the new tag will create the following images:
7575
| Image | Automation |
7676
|-----------------------------------------------------------|----------------------------------------------------------------------------------------------|
7777
| `quay.io/jetstack/venafi-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
78-
| `quay.io/jetstack/cyberark-disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
78+
| `quay.io/jetstack/disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
7979
| `registry.venafi.cloud/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule |
8080
| `private-registry.venafi.cloud/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule |
8181
| `private-registry.venafi.eu/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule |
@@ -85,7 +85,7 @@ and the following OCI Helm charts:
8585
| Helm Chart | Automation |
8686
|----------------------------------------------------------------------|----------------------------------------------------------------------------------------------|
8787
| `oci://quay.io/jetstack/charts/venafi-kubernetes-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
88-
| `oci://quay.io/jetstack/charts/cyberark-disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
88+
| `oci://quay.io/jetstack/charts/disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes |
8989
| `oci://registry.venafi.cloud/charts/venafi-kubernetes-agent` | Automatically mirrored by Harbor Replication rule |
9090
| `oci://private-registry.venafi.cloud/charts/venafi-kubernetes-agent` | Automatically mirrored by Harbor Replication rule |
9191
| `oci://private-registry.venafi.eu/charts/venafi-kubernetes-agent` | Automatically mirrored by Harbor Replication rule |
@@ -122,6 +122,6 @@ v1.1.0 (Git tag in the jetstack-secure repo)
122122

123123
NOTE(mael): TBD
124124

125-
### Step 3: Test the Helm chart "cyberark-disco-agent"
125+
### Step 3: Test the Helm chart "disco-agent"
126126

127127
NOTE(wallrj): TBD

‎deploy/charts/cyberark-disco-agent/.helmignore‎ renamed to ‎deploy/charts/disco-agent/.helmignore‎

File renamed without changes.

‎deploy/charts/cyberark-disco-agent/Chart.yaml‎ renamed to ‎deploy/charts/disco-agent/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
2-
name: cyberark-disco-agent
2+
name: disco-agent
33
description: |-
4-
The cyberark-disco-agent connects your Kubernetes or Openshift cluster to CyberArk Discovery and Context.
4+
The disco-agent connects your Kubernetes or Openshift cluster to CyberArk Discovery and Context.
55
66
maintainers:
77
- name: CyberArk

‎deploy/charts/cyberark-disco-agent/README.md‎ renamed to ‎deploy/charts/disco-agent/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cyberark-disco-agent
1+
# disco-agent
22

33
The Cyberark Discovery and Context Agent connects your Kubernetes or OpenShift
44
cluster to the Discovery and Context service of the CyberArk Identity Security Platform.
@@ -61,7 +61,7 @@ stringData:
6161
Deploy the agent:
6262

6363
```sh
64-
helm upgrade agent "oci://${OCI_BASE}/charts/cyberark-disco-agent" \
64+
helm upgrade agent "oci://${OCI_BASE}/charts/disco-agent" \
6565
--install \
6666
--create-namespace \
6767
--namespace "$NAMESPACE" \
@@ -72,7 +72,7 @@ helm upgrade agent "oci://${OCI_BASE}/charts/cyberark-disco-agent" \
7272

7373
Check the Pod and its events:
7474
```sh
75-
kubectl describe -n cyberark pods -l app.kubernetes.io/name=cyberark-disco-agent
75+
kubectl describe -n cyberark pods -l app.kubernetes.io/name=disco-agent
7676
```
7777

7878
Check the logs:
@@ -318,7 +318,7 @@ Create a PodMonitor to add the metrics to Prometheus, if you are using Prometheu
318318
#### **metrics.podmonitor.namespace** ~ `string`
319319
320320
The namespace that the pod monitor should live in.
321-
Defaults to the cyberark-disco-agent namespace.
321+
Defaults to the disco-agent namespace.
322322
323323
#### **metrics.podmonitor.prometheusInstance** ~ `string`
324324
> Default value:

‎deploy/charts/cyberark-disco-agent/templates/NOTES.txt‎ renamed to ‎deploy/charts/disco-agent/templates/NOTES.txt‎

File renamed without changes.

‎deploy/charts/cyberark-disco-agent/templates/_helpers.tpl‎ renamed to ‎deploy/charts/disco-agent/templates/_helpers.tpl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "cyberark-disco-agent.name" -}}
4+
{{- define "disco-agent.name" -}}
55
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

@@ -10,7 +10,7 @@ Create a default fully qualified app name.
1010
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1111
If release name contains chart name it will be used as a full name.
1212
*/}}
13-
{{- define "cyberark-disco-agent.fullname" -}}
13+
{{- define "disco-agent.fullname" -}}
1414
{{- if .Values.fullnameOverride }}
1515
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
1616
{{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
2626
{{/*
2727
Create chart name and version as used by the chart label.
2828
*/}}
29-
{{- define "cyberark-disco-agent.chart" -}}
29+
{{- define "disco-agent.chart" -}}
3030
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
3131
{{- end }}
3232

3333
{{/*
3434
Common labels
3535
*/}}
36-
{{- define "cyberark-disco-agent.labels" -}}
37-
helm.sh/chart: {{ include "cyberark-disco-agent.chart" . }}
38-
{{ include "cyberark-disco-agent.selectorLabels" . }}
36+
{{- define "disco-agent.labels" -}}
37+
helm.sh/chart: {{ include "disco-agent.chart" . }}
38+
{{ include "disco-agent.selectorLabels" . }}
3939
{{- if .Chart.AppVersion }}
4040
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4141
{{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4545
{{/*
4646
Selector labels
4747
*/}}
48-
{{- define "cyberark-disco-agent.selectorLabels" -}}
49-
app.kubernetes.io/name: {{ include "cyberark-disco-agent.name" . }}
48+
{{- define "disco-agent.selectorLabels" -}}
49+
app.kubernetes.io/name: {{ include "disco-agent.name" . }}
5050
app.kubernetes.io/instance: {{ .Release.Name }}
5151
{{- end }}
5252

5353
{{/*
5454
Create the name of the service account to use
5555
*/}}
56-
{{- define "cyberark-disco-agent.serviceAccountName" -}}
56+
{{- define "disco-agent.serviceAccountName" -}}
5757
{{- if .Values.serviceAccount.create }}
58-
{{- default (include "cyberark-disco-agent.fullname" .) .Values.serviceAccount.name }}
58+
{{- default (include "disco-agent.fullname" .) .Values.serviceAccount.name }}
5959
{{- else }}
6060
{{- default "default" .Values.serviceAccount.name }}
6161
{{- end }}

‎deploy/charts/cyberark-disco-agent/templates/configmap.yaml‎ renamed to ‎deploy/charts/disco-agent/templates/configmap.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ include "cyberark-disco-agent.fullname" . }}-config
4+
name: {{ include "disco-agent.fullname" . }}-config
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
{{- include "cyberark-disco-agent.labels" . | nindent 4 }}
7+
{{- include "disco-agent.labels" . | nindent 4 }}
88
data:
99
config.yaml: |-
1010
period: {{ .Values.config.period | quote }}

‎deploy/charts/cyberark-disco-agent/templates/deployment.yaml‎ renamed to ‎deploy/charts/disco-agent/templates/deployment.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ include "cyberark-disco-agent.fullname" . }}
4+
name: {{ include "disco-agent.fullname" . }}
55
labels:
6-
{{- include "cyberark-disco-agent.labels" . | nindent 4 }}
6+
{{- include "disco-agent.labels" . | nindent 4 }}
77
spec:
88
replicas: {{ .Values.replicaCount }}
99
selector:
1010
matchLabels:
11-
{{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }}
11+
{{- include "disco-agent.selectorLabels" . | nindent 6 }}
1212
template:
1313
metadata:
1414
{{- with .Values.podAnnotations }}
1515
annotations:
1616
{{- toYaml . | nindent 8 }}
1717
{{- end }}
1818
labels:
19-
{{- include "cyberark-disco-agent.labels" . | nindent 8 }}
19+
{{- include "disco-agent.labels" . | nindent 8 }}
2020
{{- with .Values.podLabels }}
2121
{{- toYaml . | nindent 8 }}
2222
{{- end }}
@@ -25,7 +25,7 @@ spec:
2525
imagePullSecrets:
2626
{{- toYaml . | nindent 8 }}
2727
{{- end }}
28-
serviceAccountName: {{ include "cyberark-disco-agent.serviceAccountName" . }}
28+
serviceAccountName: {{ include "disco-agent.serviceAccountName" . }}
2929
{{- with .Values.podSecurityContext }}
3030
securityContext:
3131
{{- toYaml . | nindent 8 }}
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- "agent"
9393
- "-c"
94-
- "/etc/cyberark-disco-agent/config.yaml"
94+
- "/etc/disco-agent/config.yaml"
9595
- --machine-hub
9696
- --logging-format=json
9797
{{- if .Values.metrics.enabled }}
@@ -109,7 +109,7 @@ spec:
109109
{{- end }}
110110
volumeMounts:
111111
- name: config
112-
mountPath: "/etc/cyberark-disco-agent"
112+
mountPath: "/etc/disco-agent"
113113
readOnly: true
114114
{{- with .Values.volumeMounts }}
115115
{{- toYaml . | nindent 12 }}
@@ -120,7 +120,7 @@ spec:
120120
volumes:
121121
- name: config
122122
configMap:
123-
name: {{ include "cyberark-disco-agent.fullname" . }}-config
123+
name: {{ include "disco-agent.fullname" . }}-config
124124
optional: false
125125
{{- with .Values.volumes }}
126126
{{- toYaml . | nindent 8 }}

‎deploy/charts/cyberark-disco-agent/templates/poddisruptionbudget.yaml‎ renamed to ‎deploy/charts/disco-agent/templates/poddisruptionbudget.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
apiVersion: policy/v1
33
kind: PodDisruptionBudget
44
metadata:
5-
name: {{ include "cyberark-disco-agent.fullname" . }}
5+
name: {{ include "disco-agent.fullname" . }}
66
namespace: {{ .Release.Namespace }}
77
labels:
8-
{{- include "cyberark-disco-agent.labels" . | nindent 4 }}
8+
{{- include "disco-agent.labels" . | nindent 4 }}
99
spec:
1010
selector:
1111
matchLabels:
12-
{{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }}
12+
{{- include "disco-agent.selectorLabels" . | nindent 6 }}
1313

1414
{{- if not (or (hasKey .Values.podDisruptionBudget "minAvailable") (hasKey .Values.podDisruptionBudget "maxUnavailable")) }}
1515
minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set

‎deploy/charts/cyberark-disco-agent/templates/podmonitor.yaml‎ renamed to ‎deploy/charts/disco-agent/templates/podmonitor.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
apiVersion: monitoring.coreos.com/v1
33
kind: PodMonitor
44
metadata:
5-
name: {{ include "cyberark-disco-agent.fullname" . }}
5+
name: {{ include "disco-agent.fullname" . }}
66
{{- if .Values.metrics.podmonitor.namespace }}
77
namespace: {{ .Values.metrics.podmonitor.namespace }}
88
{{- else }}
99
namespace: {{ .Release.Namespace | quote }}
1010
{{- end }}
1111
labels:
12-
{{- include "cyberark-disco-agent.labels" . | nindent 4 }}
12+
{{- include "disco-agent.labels" . | nindent 4 }}
1313
prometheus: {{ .Values.metrics.podmonitor.prometheusInstance }}
1414
{{- with .Values.metrics.podmonitor.labels }}
1515
{{- toYaml . | nindent 4 }}
@@ -19,10 +19,10 @@ metadata:
1919
{{- toYaml . | nindent 4 }}
2020
{{- end }}
2121
spec:
22-
jobLabel: {{ include "cyberark-disco-agent.fullname" . }}
22+
jobLabel: {{ include "disco-agent.fullname" . }}
2323
selector:
2424
matchLabels:
25-
{{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }}
25+
{{- include "disco-agent.selectorLabels" . | nindent 6 }}
2626
{{- if .Values.metrics.podmonitor.namespace }}
2727
namespaceSelector:
2828
matchNames:

0 commit comments

Comments
 (0)