-
Notifications
You must be signed in to change notification settings - Fork 104
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
[cleanup] move some common constants to v2alpha1 #1432
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,12 +5,6 @@ | |
|
||
package common | ||
|
||
import ( | ||
"time" | ||
|
||
appsv1 "k8s.io/api/apps/v1" | ||
) | ||
|
||
// TODO move most of these constants out of common | ||
|
||
// This file tracks constants related to setting up the Datadog Agents | ||
|
@@ -26,81 +20,6 @@ const ( | |
MD5AgentDeploymentAnnotationKey = "agent.datadoghq.com/agentspechash" | ||
// MD5ChecksumAnnotationKey annotation key is used to identify customConfig configurations | ||
MD5ChecksumAnnotationKey = "checksum/%s-custom-config" | ||
|
||
// DefaultAgentResourceSuffix use as suffix for agent resource naming | ||
DefaultAgentResourceSuffix = "agent" | ||
// DefaultClusterAgentResourceSuffix use as suffix for cluster-agent resource naming | ||
DefaultClusterAgentResourceSuffix = "cluster-agent" | ||
// DefaultClusterChecksRunnerResourceSuffix use as suffix for cluster-checks-runner resource naming | ||
DefaultClusterChecksRunnerResourceSuffix = "cluster-checks-runner" | ||
// DefaultMetricsServerResourceSuffix use as suffix for cluster-agent metrics-server resource naming | ||
DefaultMetricsServerResourceSuffix = "cluster-agent-metrics-server" | ||
// DefaultAPPKeyKey default app-key key (use in secret for instance). | ||
DefaultAPPKeyKey = "app_key" | ||
// DefaultAPIKeyKey default api-key key (use in secret for instance). | ||
DefaultAPIKeyKey = "api_key" | ||
// DefaultTokenKey default token key (use in secret for instance). | ||
DefaultTokenKey = "token" | ||
// DefaultClusterAgentReplicas default cluster-agent deployment replicas | ||
DefaultClusterAgentReplicas = 1 | ||
// DefaultClusterAgentServicePort default cluster-agent service port | ||
DefaultClusterAgentServicePort = 5005 | ||
// DefaultClusterChecksRunnerReplicas default cluster checks runner deployment replicas | ||
DefaultClusterChecksRunnerReplicas = 1 | ||
// DefaultMetricsServerServicePort default metrics-server port | ||
DefaultMetricsServerServicePort = 443 | ||
// DefaultMetricsServerTargetPort default metrics-server pod port | ||
DefaultMetricsServerTargetPort = int(DefaultMetricsProviderPort) | ||
// DefaultAdmissionControllerServicePort default admission controller service port | ||
DefaultAdmissionControllerServicePort = 443 | ||
// DefaultAdmissionControllerTargetPort default admission controller pod port | ||
DefaultAdmissionControllerTargetPort = 8000 | ||
// DefaultAdmissionControllerWebhookName default admission controller webhook name | ||
DefaultAdmissionControllerWebhookName string = "datadog-webhook" | ||
// DefaultDogstatsdOriginDetection default Origin Detection | ||
DefaultDogstatsdOriginDetection = "false" | ||
// DefaultDogstatsdPort default dogstatsd port | ||
DefaultDogstatsdPort = 8125 | ||
// DefaultDogstatsdPortName default dogstatsd port name | ||
DefaultDogstatsdPortName = "dogstatsdport" | ||
// DefaultMetricsProviderPort default metrics provider port | ||
DefaultMetricsProviderPort int32 = 8443 | ||
// DefaultKubeStateMetricsCoreConf default ksm core ConfigMap name | ||
DefaultKubeStateMetricsCoreConf string = "kube-state-metrics-core-config" | ||
// DefaultOrchestratorExplorerConf default orchestrator explorer ConfigMap name | ||
DefaultOrchestratorExplorerConf string = "orchestrator-explorer-config" | ||
// DefaultKubeAPIServerConf default Kubernetes APIServer ConfigMap name | ||
DefaultKubeAPIServerConf string = "kube-apiserver-config" | ||
// DefaultSystemProbeSocketPath default System Probe socket path | ||
DefaultSystemProbeSocketPath string = "/var/run/sysprobe/sysprobe.sock" | ||
// DefaultCSPMConf default CSPM ConfigMap name | ||
DefaultCSPMConf string = "cspm-config" | ||
// DefaultCWSConf default CWS ConfigMap name | ||
DefaultCWSConf string = "cws-config" | ||
// DefaultHelmCheckConf default Helm Check ConfigMap name | ||
DefaultHelmCheckConf string = "helm-check-config" | ||
|
||
// Default Image name | ||
DefaultAgentImageName string = "agent" | ||
DefaultClusterAgentImageName string = "cluster-agent" | ||
DefaultImageRegistry string = "gcr.io/datadoghq" | ||
DefaultEuropeImageRegistry string = "eu.gcr.io/datadoghq" | ||
DefaultAsiaImageRegistry string = "asia.gcr.io/datadoghq" | ||
DefaultGovImageRegistry string = "public.ecr.aws/datadog" | ||
|
||
// ExtendedDaemonset defaulting | ||
DefaultRollingUpdateMaxUnavailable = "10%" | ||
DefaultUpdateStrategy = appsv1.RollingUpdateDaemonSetStrategyType | ||
DefaultRollingUpdateMaxPodSchedulerFailure = "10%" | ||
DefaultRollingUpdateMaxParallelPodCreation int32 = 250 | ||
DefaultRollingUpdateSlowStartIntervalDuration = 1 * time.Minute | ||
DefaultRollingUpdateSlowStartAdditiveIncrease = "5" | ||
DefaultReconcileFrequency = 10 * time.Second | ||
|
||
KubeServicesAndEndpointsConfigProviders = "kube_services kube_endpoints" | ||
KubeServicesAndEndpointsListeners = "kube_services kube_endpoints" | ||
EndpointsChecksConfigProvider = "endpointschecks" | ||
ClusterAndEndpointsConfigProviders = "clusterchecks endpointschecks" | ||
) | ||
|
||
// Annotations | ||
|
@@ -205,64 +124,64 @@ const ( | |
SystemProbeConfigVolumePath = "/etc/datadog-agent/system-probe.yaml" | ||
OtelCustomConfigVolumePath = "/etc/datadog-agent/otel-config.yaml" | ||
|
||
LogDatadogVolumeName = "logdatadog" | ||
LogDatadogVolumePath = "/var/log/datadog" | ||
TmpVolumeName = "tmp" | ||
TmpVolumePath = "/tmp" | ||
CertificatesVolumeName = "certificates" | ||
CertificatesVolumePath = "/etc/datadog-agent/certificates" | ||
AuthVolumeName = "datadog-agent-auth" | ||
AuthVolumePath = "/etc/datadog-agent/auth" | ||
InstallInfoVolumeName = "installinfo" | ||
InstallInfoVolumeSubPath = "install_info" | ||
InstallInfoVolumePath = "/etc/datadog-agent/install_info" | ||
InstallInfoVolumeReadOnly = true | ||
PointerVolumeName = "pointerdir" | ||
PointerVolumePath = "/opt/datadog-agent/run" | ||
LogTempStoragePath = "/var/lib/datadog-agent/logs" | ||
PodLogVolumeName = "logpodpath" | ||
PodLogVolumePath = "/var/log/pods" | ||
ContainerLogVolumeName = "logcontainerpath" | ||
ContainerLogVolumePath = "/var/lib/docker/containers" | ||
SymlinkContainerVolumeName = "symlinkcontainerpath" | ||
SymlinkContainerVolumePath = "/var/log/containers" | ||
DogstatsdHostPortName = "dogstatsdport" | ||
DogstatsdHostPortHostPort = 8125 | ||
DogstatsdSocketVolumeName = "dsdsocket" | ||
DogstatsdAPMSocketHostPath = "/var/run/datadog" | ||
DogstatsdSocketLocalPath = "/var/run/datadog" | ||
DogstatsdSocketName = "dsd.socket" | ||
SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks" | ||
SecurityAgentComplianceConfigDirVolumeName = "compliancedir" | ||
SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d" | ||
SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies" | ||
SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies" | ||
SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir" | ||
SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d" | ||
HostCriSocketPathPrefix = "/host" | ||
CriSocketVolumeName = "runtimesocketdir" | ||
RuntimeDirVolumePath = "/var/run" | ||
KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt" | ||
KubeletCAVolumeName = "kubelet-ca" | ||
APMHostPortName = "traceport" | ||
APMHostPortHostPort = 8126 | ||
APMSocketVolumeName = "apmsocket" | ||
APMSocketVolumeLocalPath = "/var/run/datadog" | ||
APMSocketName = "apm.socket" | ||
AdmissionControllerPortName = "admissioncontrollerport" | ||
AdmissionControllerSocketCommunicationMode = "socket" | ||
ExternalMetricsPortName = "metricsapi" | ||
ExternalMetricsAPIServiceName = "v1beta1.external.metrics.k8s.io" | ||
OTLPGRPCPortName = "otlpgrpcport" | ||
OTLPHTTPPortName = "otlphttpport" | ||
SeccompSecurityVolumeName = "datadog-agent-security" | ||
SeccompSecurityVolumePath = "/etc/config" | ||
SeccompRootVolumeName = "seccomp-root" | ||
SeccompRootVolumePath = "/host/var/lib/kubelet/seccomp" | ||
SeccompRootPath = "/var/lib/kubelet/seccomp" | ||
SystemProbeSeccompKey = "system-probe-seccomp.json" | ||
SystemProbeAgentSecurityConfigMapSuffixName = "system-probe-seccomp" | ||
SystemProbeSeccompProfileName = "system-probe" | ||
LogDatadogVolumeName = "logdatadog" | ||
LogDatadogVolumePath = "/var/log/datadog" | ||
TmpVolumeName = "tmp" | ||
TmpVolumePath = "/tmp" | ||
CertificatesVolumeName = "certificates" | ||
CertificatesVolumePath = "/etc/datadog-agent/certificates" | ||
AuthVolumeName = "datadog-agent-auth" | ||
AuthVolumePath = "/etc/datadog-agent/auth" | ||
InstallInfoVolumeName = "installinfo" | ||
InstallInfoVolumeSubPath = "install_info" | ||
InstallInfoVolumePath = "/etc/datadog-agent/install_info" | ||
InstallInfoVolumeReadOnly = true | ||
PointerVolumeName = "pointerdir" | ||
PointerVolumePath = "/opt/datadog-agent/run" | ||
LogTempStoragePath = "/var/lib/datadog-agent/logs" | ||
PodLogVolumeName = "logpodpath" | ||
PodLogVolumePath = "/var/log/pods" | ||
ContainerLogVolumeName = "logcontainerpath" | ||
ContainerLogVolumePath = "/var/lib/docker/containers" | ||
SymlinkContainerVolumeName = "symlinkcontainerpath" | ||
SymlinkContainerVolumePath = "/var/log/containers" | ||
DogstatsdHostPortName = "dogstatsdport" | ||
DogstatsdHostPortHostPort = 8125 | ||
DogstatsdSocketVolumeName = "dsdsocket" | ||
DogstatsdAPMSocketHostPath = "/var/run/datadog" | ||
DogstatsdSocketLocalPath = "/var/run/datadog" | ||
DogstatsdSocketName = "dsd.socket" | ||
// SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks" // Not used | ||
SecurityAgentComplianceConfigDirVolumeName = "compliancedir" | ||
SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d" | ||
SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies" | ||
SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies" | ||
SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir" | ||
SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d" | ||
HostCriSocketPathPrefix = "/host" | ||
CriSocketVolumeName = "runtimesocketdir" | ||
RuntimeDirVolumePath = "/var/run" | ||
KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt" | ||
KubeletCAVolumeName = "kubelet-ca" | ||
APMHostPortName = "traceport" | ||
// APMHostPortHostPort = 8126 // Not used | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i didn't remove these because i don't want to forget to check for consistency when moving these constants |
||
APMSocketVolumeName = "apmsocket" | ||
APMSocketVolumeLocalPath = "/var/run/datadog" | ||
APMSocketName = "apm.socket" | ||
AdmissionControllerPortName = "admissioncontrollerport" | ||
AdmissionControllerSocketCommunicationMode = "socket" | ||
ExternalMetricsPortName = "metricsapi" | ||
ExternalMetricsAPIServiceName = "v1beta1.external.metrics.k8s.io" | ||
OTLPGRPCPortName = "otlpgrpcport" | ||
OTLPHTTPPortName = "otlphttpport" | ||
SeccompSecurityVolumeName = "datadog-agent-security" | ||
SeccompSecurityVolumePath = "/etc/config" | ||
SeccompRootVolumeName = "seccomp-root" | ||
SeccompRootVolumePath = "/host/var/lib/kubelet/seccomp" | ||
SeccompRootPath = "/var/lib/kubelet/seccomp" | ||
SystemProbeSeccompKey = "system-probe-seccomp.json" | ||
SystemProbeAgentSecurityConfigMapSuffixName = "system-probe-seccomp" | ||
SystemProbeSeccompProfileName = "system-probe" | ||
|
||
AppArmorAnnotationKey = "container.apparmor.security.beta.kubernetes.io" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👏 Good catch, these were only used in Agent default
v1alpha1