diff --git a/RELEASE.md b/RELEASE.md index 3958e6bd..529f7e65 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,8 +12,8 @@ The release process is semi-automated. > Upon pushing the tag, a GitHub Action will do the following: > - Build and publish the container image: `quay.io/jetstack/venafi-agent`, > - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/venafi-kubernetes-agent`, -> - Build and publish the container image: `quay.io/jetstack/cyberark-disco-agent`, -> - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/cyberark-disco-agent`, +> - Build and publish the container image: `quay.io/jetstack/disco-agent`, +> - Build and publish the Helm chart: `oci://quay.io/jetstack/charts/disco-agent`, > - Create a draft GitHub release, 1. Upgrade the Go dependencies. @@ -75,7 +75,7 @@ For context, the new tag will create the following images: | Image | Automation | |-----------------------------------------------------------|----------------------------------------------------------------------------------------------| | `quay.io/jetstack/venafi-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | -| `quay.io/jetstack/cyberark-disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | +| `quay.io/jetstack/disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | | `registry.venafi.cloud/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule | | `private-registry.venafi.cloud/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule | | `private-registry.venafi.eu/venafi-agent/venafi-agent` | Automatically mirrored by Harbor Replication rule | @@ -85,7 +85,7 @@ and the following OCI Helm charts: | Helm Chart | Automation | |----------------------------------------------------------------------|----------------------------------------------------------------------------------------------| | `oci://quay.io/jetstack/charts/venafi-kubernetes-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | -| `oci://quay.io/jetstack/charts/cyberark-disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | +| `oci://quay.io/jetstack/charts/disco-agent` | Automatically built by the [release action](.github/workflows/release.yml) on Git tag pushes | | `oci://registry.venafi.cloud/charts/venafi-kubernetes-agent` | Automatically mirrored by Harbor Replication rule | | `oci://private-registry.venafi.cloud/charts/venafi-kubernetes-agent` | Automatically mirrored by Harbor Replication rule | | `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) NOTE(mael): TBD -### Step 3: Test the Helm chart "cyberark-disco-agent" +### Step 3: Test the Helm chart "disco-agent" NOTE(wallrj): TBD diff --git a/deploy/charts/cyberark-disco-agent/.helmignore b/deploy/charts/disco-agent/.helmignore similarity index 100% rename from deploy/charts/cyberark-disco-agent/.helmignore rename to deploy/charts/disco-agent/.helmignore diff --git a/deploy/charts/cyberark-disco-agent/Chart.yaml b/deploy/charts/disco-agent/Chart.yaml similarity index 76% rename from deploy/charts/cyberark-disco-agent/Chart.yaml rename to deploy/charts/disco-agent/Chart.yaml index f02b6bf0..24c93722 100644 --- a/deploy/charts/cyberark-disco-agent/Chart.yaml +++ b/deploy/charts/disco-agent/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -name: cyberark-disco-agent +name: disco-agent description: |- - The cyberark-disco-agent connects your Kubernetes or Openshift cluster to CyberArk Discovery and Context. + The disco-agent connects your Kubernetes or Openshift cluster to CyberArk Discovery and Context. maintainers: - name: CyberArk diff --git a/deploy/charts/cyberark-disco-agent/README.md b/deploy/charts/disco-agent/README.md similarity index 97% rename from deploy/charts/cyberark-disco-agent/README.md rename to deploy/charts/disco-agent/README.md index 4ab94357..ec2c3ed9 100644 --- a/deploy/charts/cyberark-disco-agent/README.md +++ b/deploy/charts/disco-agent/README.md @@ -1,4 +1,4 @@ -# cyberark-disco-agent +# disco-agent The Cyberark Discovery and Context Agent connects your Kubernetes or OpenShift cluster to the Discovery and Context service of the CyberArk Identity Security Platform. @@ -61,7 +61,7 @@ stringData: Deploy the agent: ```sh -helm upgrade agent "oci://${OCI_BASE}/charts/cyberark-disco-agent" \ +helm upgrade agent "oci://${OCI_BASE}/charts/disco-agent" \ --install \ --create-namespace \ --namespace "$NAMESPACE" \ @@ -72,7 +72,7 @@ helm upgrade agent "oci://${OCI_BASE}/charts/cyberark-disco-agent" \ Check the Pod and its events: ```sh -kubectl describe -n cyberark pods -l app.kubernetes.io/name=cyberark-disco-agent +kubectl describe -n cyberark pods -l app.kubernetes.io/name=disco-agent ``` Check the logs: @@ -318,7 +318,7 @@ Create a PodMonitor to add the metrics to Prometheus, if you are using Prometheu #### **metrics.podmonitor.namespace** ~ `string` The namespace that the pod monitor should live in. -Defaults to the cyberark-disco-agent namespace. +Defaults to the disco-agent namespace. #### **metrics.podmonitor.prometheusInstance** ~ `string` > Default value: diff --git a/deploy/charts/cyberark-disco-agent/templates/NOTES.txt b/deploy/charts/disco-agent/templates/NOTES.txt similarity index 100% rename from deploy/charts/cyberark-disco-agent/templates/NOTES.txt rename to deploy/charts/disco-agent/templates/NOTES.txt diff --git a/deploy/charts/cyberark-disco-agent/templates/_helpers.tpl b/deploy/charts/disco-agent/templates/_helpers.tpl similarity index 70% rename from deploy/charts/cyberark-disco-agent/templates/_helpers.tpl rename to deploy/charts/disco-agent/templates/_helpers.tpl index 1a43b7cf..73107c5f 100644 --- a/deploy/charts/cyberark-disco-agent/templates/_helpers.tpl +++ b/deploy/charts/disco-agent/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "cyberark-disco-agent.name" -}} +{{- define "disco-agent.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "cyberark-disco-agent.fullname" -}} +{{- define "disco-agent.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "cyberark-disco-agent.chart" -}} +{{- define "disco-agent.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "cyberark-disco-agent.labels" -}} -helm.sh/chart: {{ include "cyberark-disco-agent.chart" . }} -{{ include "cyberark-disco-agent.selectorLabels" . }} +{{- define "disco-agent.labels" -}} +helm.sh/chart: {{ include "disco-agent.chart" . }} +{{ include "disco-agent.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "cyberark-disco-agent.selectorLabels" -}} -app.kubernetes.io/name: {{ include "cyberark-disco-agent.name" . }} +{{- define "disco-agent.selectorLabels" -}} +app.kubernetes.io/name: {{ include "disco-agent.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "cyberark-disco-agent.serviceAccountName" -}} +{{- define "disco-agent.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "cyberark-disco-agent.fullname" .) .Values.serviceAccount.name }} +{{- default (include "disco-agent.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/deploy/charts/cyberark-disco-agent/templates/configmap.yaml b/deploy/charts/disco-agent/templates/configmap.yaml similarity index 95% rename from deploy/charts/cyberark-disco-agent/templates/configmap.yaml rename to deploy/charts/disco-agent/templates/configmap.yaml index d9703168..1dea3d10 100644 --- a/deploy/charts/cyberark-disco-agent/templates/configmap.yaml +++ b/deploy/charts/disco-agent/templates/configmap.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-config + name: {{ include "disco-agent.fullname" . }}-config namespace: {{ .Release.Namespace }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} data: config.yaml: |- period: {{ .Values.config.period | quote }} diff --git a/deploy/charts/cyberark-disco-agent/templates/deployment.yaml b/deploy/charts/disco-agent/templates/deployment.yaml similarity index 88% rename from deploy/charts/cyberark-disco-agent/templates/deployment.yaml rename to deploy/charts/disco-agent/templates/deployment.yaml index 98e9bc26..74390e81 100644 --- a/deploy/charts/cyberark-disco-agent/templates/deployment.yaml +++ b/deploy/charts/disco-agent/templates/deployment.yaml @@ -1,14 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "cyberark-disco-agent.fullname" . }} + name: {{ include "disco-agent.fullname" . }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - {{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }} + {{- include "disco-agent.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} @@ -16,7 +16,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 8 }} + {{- include "disco-agent.labels" . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} @@ -25,7 +25,7 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - serviceAccountName: {{ include "cyberark-disco-agent.serviceAccountName" . }} + serviceAccountName: {{ include "disco-agent.serviceAccountName" . }} {{- with .Values.podSecurityContext }} securityContext: {{- toYaml . | nindent 8 }} @@ -91,7 +91,7 @@ spec: args: - "agent" - "-c" - - "/etc/cyberark-disco-agent/config.yaml" + - "/etc/disco-agent/config.yaml" - --machine-hub - --logging-format=json {{- if .Values.metrics.enabled }} @@ -109,7 +109,7 @@ spec: {{- end }} volumeMounts: - name: config - mountPath: "/etc/cyberark-disco-agent" + mountPath: "/etc/disco-agent" readOnly: true {{- with .Values.volumeMounts }} {{- toYaml . | nindent 12 }} @@ -120,7 +120,7 @@ spec: volumes: - name: config configMap: - name: {{ include "cyberark-disco-agent.fullname" . }}-config + name: {{ include "disco-agent.fullname" . }}-config optional: false {{- with .Values.volumes }} {{- toYaml . | nindent 8 }} diff --git a/deploy/charts/cyberark-disco-agent/templates/poddisruptionbudget.yaml b/deploy/charts/disco-agent/templates/poddisruptionbudget.yaml similarity index 78% rename from deploy/charts/cyberark-disco-agent/templates/poddisruptionbudget.yaml rename to deploy/charts/disco-agent/templates/poddisruptionbudget.yaml index fb8c73eb..61e96dbe 100644 --- a/deploy/charts/cyberark-disco-agent/templates/poddisruptionbudget.yaml +++ b/deploy/charts/disco-agent/templates/poddisruptionbudget.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: {{ include "cyberark-disco-agent.fullname" . }} + name: {{ include "disco-agent.fullname" . }} namespace: {{ .Release.Namespace }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} spec: selector: matchLabels: - {{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }} + {{- include "disco-agent.selectorLabels" . | nindent 6 }} {{- if not (or (hasKey .Values.podDisruptionBudget "minAvailable") (hasKey .Values.podDisruptionBudget "maxUnavailable")) }} minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set diff --git a/deploy/charts/cyberark-disco-agent/templates/podmonitor.yaml b/deploy/charts/disco-agent/templates/podmonitor.yaml similarity index 82% rename from deploy/charts/cyberark-disco-agent/templates/podmonitor.yaml rename to deploy/charts/disco-agent/templates/podmonitor.yaml index b486e02b..f5144b02 100644 --- a/deploy/charts/cyberark-disco-agent/templates/podmonitor.yaml +++ b/deploy/charts/disco-agent/templates/podmonitor.yaml @@ -2,14 +2,14 @@ apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: - name: {{ include "cyberark-disco-agent.fullname" . }} + name: {{ include "disco-agent.fullname" . }} {{- if .Values.metrics.podmonitor.namespace }} namespace: {{ .Values.metrics.podmonitor.namespace }} {{- else }} namespace: {{ .Release.Namespace | quote }} {{- end }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} prometheus: {{ .Values.metrics.podmonitor.prometheusInstance }} {{- with .Values.metrics.podmonitor.labels }} {{- toYaml . | nindent 4 }} @@ -19,10 +19,10 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - jobLabel: {{ include "cyberark-disco-agent.fullname" . }} + jobLabel: {{ include "disco-agent.fullname" . }} selector: matchLabels: - {{- include "cyberark-disco-agent.selectorLabels" . | nindent 6 }} + {{- include "disco-agent.selectorLabels" . | nindent 6 }} {{- if .Values.metrics.podmonitor.namespace }} namespaceSelector: matchNames: diff --git a/deploy/charts/cyberark-disco-agent/templates/rbac.yaml b/deploy/charts/disco-agent/templates/rbac.yaml similarity index 51% rename from deploy/charts/cyberark-disco-agent/templates/rbac.yaml rename to deploy/charts/disco-agent/templates/rbac.yaml index b0a0c7be..f3fae414 100644 --- a/deploy/charts/cyberark-disco-agent/templates/rbac.yaml +++ b/deploy/charts/disco-agent/templates/rbac.yaml @@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-event-emitted + name: {{ include "disco-agent.fullname" . }}-event-emitted labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} rules: - apiGroups: [""] resources: ["events"] @@ -13,39 +13,39 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-event-emitted + name: {{ include "disco-agent.fullname" . }}-event-emitted labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ include "cyberark-disco-agent.fullname" . }}-event-emitted + name: {{ include "disco-agent.fullname" . }}-event-emitted subjects: - kind: ServiceAccount - name: {{ include "cyberark-disco-agent.serviceAccountName" . }} + name: {{ include "disco-agent.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-cluster-viewer + name: {{ include "disco-agent.fullname" . }}-cluster-viewer labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: view subjects: - kind: ServiceAccount - name: {{ include "cyberark-disco-agent.serviceAccountName" . }} + name: {{ include "disco-agent.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-secret-reader + name: {{ include "disco-agent.fullname" . }}-secret-reader labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} rules: - apiGroups: [""] resources: ["secrets"] @@ -54,24 +54,24 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-secret-reader + name: {{ include "disco-agent.fullname" . }}-secret-reader labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} roleRef: kind: ClusterRole - name: {{ include "cyberark-disco-agent.fullname" . }}-secret-reader + name: {{ include "disco-agent.fullname" . }}-secret-reader apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount - name: {{ include "cyberark-disco-agent.serviceAccountName" . }} + name: {{ include "disco-agent.serviceAccountName" . }} namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-rbac-reader + name: {{ include "disco-agent.fullname" . }}-rbac-reader labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} rules: - apiGroups: ["rbac.authorization.k8s.io"] resources: @@ -84,15 +84,15 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "cyberark-disco-agent.fullname" . }}-rbac-reader + name: {{ include "disco-agent.fullname" . }}-rbac-reader labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} roleRef: kind: ClusterRole - name: {{ include "cyberark-disco-agent.fullname" . }}-rbac-reader + name: {{ include "disco-agent.fullname" . }}-rbac-reader apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount - name: {{ include "cyberark-disco-agent.serviceAccountName" . }} + name: {{ include "disco-agent.serviceAccountName" . }} namespace: {{ .Release.Namespace }} diff --git a/deploy/charts/cyberark-disco-agent/templates/serviceaccount.yaml b/deploy/charts/disco-agent/templates/serviceaccount.yaml similarity index 68% rename from deploy/charts/cyberark-disco-agent/templates/serviceaccount.yaml rename to deploy/charts/disco-agent/templates/serviceaccount.yaml index a69e9643..6ec5f0b7 100644 --- a/deploy/charts/cyberark-disco-agent/templates/serviceaccount.yaml +++ b/deploy/charts/disco-agent/templates/serviceaccount.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ include "cyberark-disco-agent.serviceAccountName" . }} + name: {{ include "disco-agent.serviceAccountName" . }} labels: - {{- include "cyberark-disco-agent.labels" . | nindent 4 }} + {{- include "disco-agent.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/deploy/charts/cyberark-disco-agent/tests/README.md b/deploy/charts/disco-agent/tests/README.md similarity index 100% rename from deploy/charts/cyberark-disco-agent/tests/README.md rename to deploy/charts/disco-agent/tests/README.md diff --git a/deploy/charts/cyberark-disco-agent/tests/__snapshot__/configmap_test.yaml.snap b/deploy/charts/disco-agent/tests/__snapshot__/configmap_test.yaml.snap similarity index 95% rename from deploy/charts/cyberark-disco-agent/tests/__snapshot__/configmap_test.yaml.snap rename to deploy/charts/disco-agent/tests/__snapshot__/configmap_test.yaml.snap index 0e2ca62b..f5e30426 100644 --- a/deploy/charts/cyberark-disco-agent/tests/__snapshot__/configmap_test.yaml.snap +++ b/deploy/charts/disco-agent/tests/__snapshot__/configmap_test.yaml.snap @@ -98,10 +98,10 @@ custom-period: labels: app.kubernetes.io/instance: test app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: cyberark-disco-agent + app.kubernetes.io/name: disco-agent app.kubernetes.io/version: v0.0.0 - helm.sh/chart: cyberark-disco-agent-0.0.0 - name: test-cyberark-disco-agent-config + helm.sh/chart: disco-agent-0.0.0 + name: test-disco-agent-config namespace: test-ns defaults: 1: | @@ -203,8 +203,8 @@ defaults: labels: app.kubernetes.io/instance: test app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: cyberark-disco-agent + app.kubernetes.io/name: disco-agent app.kubernetes.io/version: v0.0.0 - helm.sh/chart: cyberark-disco-agent-0.0.0 - name: test-cyberark-disco-agent-config + helm.sh/chart: disco-agent-0.0.0 + name: test-disco-agent-config namespace: test-ns diff --git a/deploy/charts/cyberark-disco-agent/tests/configmap_test.yaml b/deploy/charts/disco-agent/tests/configmap_test.yaml similarity index 100% rename from deploy/charts/cyberark-disco-agent/tests/configmap_test.yaml rename to deploy/charts/disco-agent/tests/configmap_test.yaml diff --git a/deploy/charts/cyberark-disco-agent/values.linter.exceptions b/deploy/charts/disco-agent/values.linter.exceptions similarity index 100% rename from deploy/charts/cyberark-disco-agent/values.linter.exceptions rename to deploy/charts/disco-agent/values.linter.exceptions diff --git a/deploy/charts/cyberark-disco-agent/values.schema.json b/deploy/charts/disco-agent/values.schema.json similarity index 99% rename from deploy/charts/cyberark-disco-agent/values.schema.json rename to deploy/charts/disco-agent/values.schema.json index 62f20129..6699bd61 100644 --- a/deploy/charts/cyberark-disco-agent/values.schema.json +++ b/deploy/charts/disco-agent/values.schema.json @@ -277,7 +277,7 @@ "type": "object" }, "helm-values.metrics.podmonitor.namespace": { - "description": "The namespace that the pod monitor should live in.\nDefaults to the cyberark-disco-agent namespace.", + "description": "The namespace that the pod monitor should live in.\nDefaults to the disco-agent namespace.", "type": "string" }, "helm-values.metrics.podmonitor.prometheusInstance": { diff --git a/deploy/charts/cyberark-disco-agent/values.yaml b/deploy/charts/disco-agent/values.yaml similarity index 98% rename from deploy/charts/cyberark-disco-agent/values.yaml rename to deploy/charts/disco-agent/values.yaml index bb700756..c2ae1bab 100644 --- a/deploy/charts/cyberark-disco-agent/values.yaml +++ b/deploy/charts/disco-agent/values.yaml @@ -1,4 +1,4 @@ -# Default values for cyberark-disco-agent. +# Default values for disco-agent. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -160,7 +160,7 @@ metrics: enabled: false # The namespace that the pod monitor should live in. - # Defaults to the cyberark-disco-agent namespace. + # Defaults to the disco-agent namespace. # +docs:property # namespace: cyberark diff --git a/hack/ark/test-e2e.sh b/hack/ark/test-e2e.sh index 604d2f9c..3555f27b 100755 --- a/hack/ark/test-e2e.sh +++ b/hack/ark/test-e2e.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Build and deploy the cyberark-disco-agent Helm chart. +# Build and deploy the disco-agent Helm chart. # Wait for the agent to log a message indicating successful data upload. # # Prerequisites: @@ -87,7 +87,7 @@ timeout 60 jq -n \ # Query the Prometheus metrics endpoint to ensure it's working. kubectl get pod \ --namespace cyberark \ - --selector app.kubernetes.io/name=cyberark-disco-agent \ + --selector app.kubernetes.io/name=disco-agent \ --output jsonpath={.items[*].metadata.name} \ | xargs -I{} kubectl get --raw /api/v1/namespaces/cyberark/pods/{}:8081/proxy/metrics \ | grep '^process_' @@ -95,7 +95,7 @@ kubectl get pod \ # Query the pprof endpoint to ensure it's working. kubectl get pod \ --namespace cyberark \ - --selector app.kubernetes.io/name=cyberark-disco-agent \ + --selector app.kubernetes.io/name=disco-agent \ --output jsonpath={.items[*].metadata.name} \ | xargs -I{} kubectl get --raw /api/v1/namespaces/cyberark/pods/{}:8081/proxy/debug/pprof/cmdline \ | xargs -0 diff --git a/internal/cyberark/api/telemetry.go b/internal/cyberark/api/telemetry.go index d0c40a56..ff2694a2 100644 --- a/internal/cyberark/api/telemetry.go +++ b/internal/cyberark/api/telemetry.go @@ -29,7 +29,7 @@ var ( func init() { telemetryValues = url.Values{} - telemetryValues.Set("in", "cyberark-disco-agent") + telemetryValues.Set("in", "disco-agent") telemetryValues.Set("vn", "CyberArk") telemetryValues.Set("it", "KubernetesAgent") telemetryValues.Set("iv", version.PreflightVersion) diff --git a/make/02_mod.mk b/make/02_mod.mk index f56a89d3..12760fa0 100644 --- a/make/02_mod.mk +++ b/make/02_mod.mk @@ -58,13 +58,13 @@ test-e2e-gke: | $(NEEDS_HELM) $(NEEDS_STEP) $(NEEDS_VENCTL) ## Run `helm unittest`. ## @category Testing test-helm: | $(NEEDS_HELM-UNITTEST) - $(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,cyberark-disco-agent} + $(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,disco-agent} .PHONY: test-helm-snapshot ## Update the `helm unittest` snapshots. ## @category Testing test-helm-snapshot: | $(NEEDS_HELM-UNITTEST) - $(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,cyberark-disco-agent} -u + $(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,disco-agent} -u .PHONY: helm-plugins ## Install required helm plugins diff --git a/make/ark/00_mod.mk b/make/ark/00_mod.mk index f4fa6906..481e43d7 100644 --- a/make/ark/00_mod.mk +++ b/make/ark/00_mod.mk @@ -7,9 +7,9 @@ go_ark_ldflags := \ -X $(repo_name)/pkg/version.BuildDate=$(shell date "+%F-%T-%Z") \ oci_ark_base_image_flavor := static -oci_ark_image_name := quay.io/jetstack/cyberark-disco-agent +oci_ark_image_name := quay.io/jetstack/disco-agent oci_ark_image_tag := $(VERSION) -oci_ark_image_name_development := jetstack.local/cyberark-disco-agent +oci_ark_image_name_development := jetstack.local/disco-agent # Annotations are the standardised set of annotations we set on every component we publish oci_ark_build_args := \ diff --git a/make/ark/02_mod.mk b/make/ark/02_mod.mk index 21a4a529..96e66206 100644 --- a/make/ark/02_mod.mk +++ b/make/ark/02_mod.mk @@ -5,11 +5,11 @@ ARK_OCI_BASE ?= quay.io/jetstack # The OCI repository (without tag) for the CyberArk Discovery and Context Agent Docker image # Can be overridden when calling `make ark-release` to push to a different repository. -ARK_IMAGE ?= $(ARK_OCI_BASE)/cyberark-disco-agent +ARK_IMAGE ?= $(ARK_OCI_BASE)/disco-agent # The OCI repository (without tag) for the CyberArk Discovery and Context Helm chart # Can be overridden when calling `make ark-release` to push to a different repository. -ARK_CHART ?= $(ARK_OCI_BASE)/charts/cyberark-disco-agent +ARK_CHART ?= $(ARK_OCI_BASE)/charts/disco-agent # Used to output variables when running in GitHub Actions GITHUB_OUTPUT ?= /dev/stderr @@ -18,13 +18,13 @@ GITHUB_OUTPUT ?= /dev/stderr ## Publish all release artifacts (image + helm chart) ## @category CyberArk Discovery and Context ark-release: oci_ark_image_digest_path := $(bin_dir)/scratch/image/oci-layout-ark.digests -ark-release: helm_digest_path := $(bin_dir)/scratch/helm/cyberark-disco-agent-$(helm_chart_version).digests +ark-release: helm_digest_path := $(bin_dir)/scratch/helm/disco-agent-$(helm_chart_version).digests ark-release: $(MAKE) oci-push-ark helm-chart-oci-push \ oci_ark_image_name="$(ARK_IMAGE)" \ helm_image_name="$(ARK_IMAGE)" \ helm_image_tag="$(oci_ark_image_tag)" \ - helm_chart_source_dir=deploy/charts/cyberark-disco-agent \ + helm_chart_source_dir=deploy/charts/disco-agent \ helm_chart_image_name="$(ARK_CHART)" @echo "ARK_IMAGE=$(ARK_IMAGE)" >> "$(GITHUB_OUTPUT)" @@ -48,7 +48,7 @@ ark-test-e2e: $(NEEDS_KIND) $(NEEDS_KUBECTL) $(NEEDS_HELM) ## @category CyberArk Discovery and Context ark-verify: $(MAKE) verify-helm-lint verify-helm-values verify-pod-security-standards verify-helm-kubeconform \ - helm_chart_source_dir=deploy/charts/cyberark-disco-agent \ + helm_chart_source_dir=deploy/charts/disco-agent \ helm_chart_image_name=$(ARK_CHART) shared_verify_targets += ark-verify @@ -58,7 +58,7 @@ shared_verify_targets += ark-verify ## @category CyberArk Discovery and Context ark-generate: $(MAKE) generate-helm-docs generate-helm-schema \ - helm_chart_source_dir=deploy/charts/cyberark-disco-agent + helm_chart_source_dir=deploy/charts/disco-agent shared_generate_targets += ark-generate