Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion deploy/charts/disco-agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ This will set the replicaset count more information can be found here: https://k
> false
> ```

Must be set to indicate that you have read and accepted the CyberArk Terms of Service. If false, the helm chart will fail to install and will print a message with instructions on how to accept the TOS.
Must be set to indicate that you have read and accepted the Palo Alto Networks End User License Agreement (https://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf). If false, the helm chart will fail to install and will print a message with instructions on how to accept the EULA.
#### **imageRegistry** ~ `string`
> Default value:
> ```yaml
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/disco-agent/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if not .Values.acceptTerms }}
{{- fail "\n\n=================================================================\n Terms & Conditions Notice\n=================================================================\n\nBefore installing this application, you must review and accept\nthe terms and conditions available at:\nhttps://www.cyberark.com/contract-terms/\n\nTo proceed with installation, you must indicate acceptance by\nsetting:\n\n - In your values file: acceptTerms: true\n or\n - Via the Helm flag: --set acceptTerms=true\n\nBy continuing with the next command, you confirm that you have\nreviewed and accepted these terms and conditions.\n\n=================================================================\n" }}
{{- fail "\n\n=================================================================\n Terms & Conditions Notice\n=================================================================\n\nBefore installing this application, you must review and accept\nthe terms and conditions available at:\nhttps://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf\n\nTo proceed with installation, you must indicate acceptance by\nsetting:\n\n - In your values file: acceptTerms: true\n or\n - Via the Helm flag: --set acceptTerms=true\n\nBy continuing with the next command, you confirm that you have\nreviewed and accepted these terms and conditions.\n\n=================================================================\n" }}
{{- end }}
apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/disco-agent/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
},
"helm-values.acceptTerms": {
"default": false,
"description": "Must be set to indicate that you have read and accepted the CyberArk Terms of Service. If false, the helm chart will fail to install and will print a message with instructions on how to accept the TOS.",
"description": "Must be set to indicate that you have read and accepted the Palo Alto Networks End User License Agreement (https://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf). If false, the helm chart will fail to install and will print a message with instructions on how to accept the EULA.",
"type": "boolean"
},
"helm-values.affinity": {
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/disco-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
replicaCount: 1

# Must be set to indicate that you have read and accepted the CyberArk Terms of Service. If false, the helm chart will fail to install and will print a message with instructions on how to accept the TOS.
# Must be set to indicate that you have read and accepted the Palo Alto Networks End User License Agreement (https://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf). If false, the helm chart will fail to install and will print a message with instructions on how to accept the EULA.
acceptTerms: false

# The container registry used for disco-agent images by default.
Expand Down
2 changes: 1 addition & 1 deletion make/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ oci_preflight_image_name_development := jetstack.local/venafi-agent
# Annotations are the standardised set of annotations we set on every component we publish
oci_preflight_build_args := \
--image-annotation="org.opencontainers.image.vendor"="CyberArk Software Ltd." \
--image-annotation="org.opencontainers.image.licenses"="EULA - https://www.cyberark.com/contract-terms/" \
--image-annotation="org.opencontainers.image.licenses"="EULA - https://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf" \
--image-annotation="org.opencontainers.image.authors"="support@cyberark.com" \
--image-annotation="org.opencontainers.image.title"="Discovery Agent for CyberArk Certificate Manager in Kubernetes and OpenShift Environments" \
--image-annotation="org.opencontainers.image.description"="Gathers machine identity data from Kubernetes clusters." \
Expand Down
2 changes: 1 addition & 1 deletion make/ark/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ oci_ark_image_name_development := jetstack.local/disco-agent
oci_ark_build_args := \
--image-annotation="org.opencontainers.image.source"="https://github.com/jetstack/jetstack-secure" \
--image-annotation="org.opencontainers.image.vendor"="CyberArk Software Ltd." \
--image-annotation="org.opencontainers.image.licenses"="EULA - https://www.cyberark.com/contract-terms/" \
--image-annotation="org.opencontainers.image.licenses"="EULA - https://www.paloaltonetworks.com/content/dam/pan/en_US/assets/pdf/legal/palo-alto-networks-end-user-license-agreement-eula.pdf" \
--image-annotation="org.opencontainers.image.authors"="CyberArk Software Ltd." \
--image-annotation="org.opencontainers.image.title"="CyberArk Discovery and Context Agent" \
--image-annotation="org.opencontainers.image.description"="Gathers machine identity data from Kubernetes clusters." \
Expand Down
Loading