release v0.6.0-rc.7

DataDog · May 4, 2021 · 97c86bc · 97c86bc
1 parent dceb4bf
commit 97c86bc
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 14 deletions.
diff --git a/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml b/bundle-redhat/manifests/datadog-operator.clusterserviceversion.yaml
@@ -103,7 +103,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/DataDog/datadog-operator
-  name: datadog-operator.v0.6.0-rc.6
+  name: datadog-operator.v0.6.0-rc.7
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -731,7 +731,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: datadog/operator:0.6.0-rc.6
+                image: datadog/operator:0.6.0-rc.7
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -820,5 +820,5 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  version: 0.6.0-rc.6
+  version: 0.6.0-rc.7
   replaces: datadog-operator.v0.5.1
diff --git a/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml b/bundle-redhat/manifests/datadoghq.com_datadogagents.yaml
@@ -64,6 +64,16 @@ spec:
                 apm:
                   description: Trace Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Trace Agent container
+                      items:
+                        type: string
+                      type: array
                     enabled:
                       description: 'Enable this to enable APM and tracing, on port 8126. See also: https://github.com/DataDog/docker-dd-agent#tracing-from-the-host'
                       type: boolean
@@ -212,6 +222,11 @@ spec:
                 config:
                   description: Agent configuration.
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     checksd:
                       description: Checksd configuration allowing to specify custom checks placed under /etc/datadog-agent/checks.d/ See https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6 for more details.
                       properties:
@@ -222,6 +237,11 @@ spec:
                     collectEvents:
                       description: 'Enables this to start event collection from the Kubernetes API. See also: https://docs.datadoghq.com/agent/kubernetes/event_collection/'
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for the Agent container
+                      items:
+                        type: string
+                      type: array
                     confd:
                       description: Confd configuration allowing to specify config files for custom checks placed under /etc/datadog-agent/conf.d/. See https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6 for more details.
                       properties:
@@ -1822,6 +1842,16 @@ spec:
                 process:
                   description: Process Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Process Agent container
+                      items:
+                        type: string
+                      type: array
                     enabled:
                       description: 'Note: /etc/passwd is automatically mounted to allow username resolution. See also: https://docs.datadoghq.com/graphing/infrastructure/process/#kubernetes-daemonset'
                       type: boolean
@@ -1969,6 +1999,16 @@ spec:
                 security:
                   description: Security Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Security Agent container
+                      items:
+                        type: string
+                      type: array
                     compliance:
                       description: Compliance configuration.
                       properties:
@@ -2141,12 +2181,22 @@ spec:
                     appArmorProfileName:
                       description: AppArmorProfileName specify a apparmor profile.
                       type: string
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     bpfDebugEnabled:
                       description: BPFDebugEnabled logging for kernel debug.
                       type: boolean
                     collectDNSStats:
                       description: CollectDNSStats enables DNS stat collection.
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for System Probe container
+                      items:
+                        type: string
+                      type: array
                     conntrackEnabled:
                       description: 'ConntrackEnabled enable the system-probe agent to connect to the netlink/conntrack subsystem to add NAT information to connection data. See also: http://conntrack-tools.netfilter.org/'
                       type: boolean
@@ -2732,12 +2782,22 @@ spec:
                           description: ServiceName corresponds to the webhook service name.
                           type: string
                       type: object
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     clusterChecksEnabled:
                       description: 'Enable the Cluster Checks and Endpoint Checks feature on both the cluster-agents and the daemonset. See also: https://docs.datadoghq.com/agent/cluster_agent/clusterchecks/ https://docs.datadoghq.com/agent/cluster_agent/endpointschecks/ Autodiscovery via Kube Service annotations is automatically enabled.'
                       type: boolean
                     collectEvents:
                       description: 'Enable this to start event collection from the kubernetes API. See also: https://docs.datadoghq.com/agent/cluster_agent/event_collection/'
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for Cluster Agent container
+                      items:
+                        type: string
+                      type: array
                     confd:
                       description: Confd Provide additional cluster check configurations. Each key will become a file in /conf.d. see https://docs.datadoghq.com/agent/autodiscovery/ for more details.
                       properties:
@@ -4294,6 +4354,16 @@ spec:
                 config:
                   description: Agent configuration.
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Cluster Checks Runner container
+                      items:
+                        type: string
+                      type: array
                     env:
                       description: 'The Datadog Agent supports many environment variables. See also: https://docs.datadoghq.com/agent/docker/?tab=standard#environment-variables'
                       items:

diff --git a/bundle/manifests/datadog-operator.clusterserviceversion.yaml b/bundle/manifests/datadog-operator.clusterserviceversion.yaml
@@ -103,7 +103,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.4.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/DataDog/datadog-operator
-  name: datadog-operator.v0.6.0-rc.6
+  name: datadog-operator.v0.6.0-rc.7
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -731,7 +731,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: gcr.io/datadoghq/operator:0.6.0-rc.6
+                image: gcr.io/datadoghq/operator:0.6.0-rc.7
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -820,5 +820,5 @@ spec:
   maturity: alpha
   provider:
     name: Datadog
-  version: 0.6.0-rc.6
+  version: 0.6.0-rc.7
   replaces: datadog-operator.v0.5.0
diff --git a/bundle/manifests/datadoghq.com_datadogagents.yaml b/bundle/manifests/datadoghq.com_datadogagents.yaml
@@ -64,6 +64,16 @@ spec:
                 apm:
                   description: Trace Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Trace Agent container
+                      items:
+                        type: string
+                      type: array
                     enabled:
                       description: 'Enable this to enable APM and tracing, on port 8126. See also: https://github.com/DataDog/docker-dd-agent#tracing-from-the-host'
                       type: boolean
@@ -212,6 +222,11 @@ spec:
                 config:
                   description: Agent configuration.
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     checksd:
                       description: Checksd configuration allowing to specify custom checks placed under /etc/datadog-agent/checks.d/ See https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6 for more details.
                       properties:
@@ -222,6 +237,11 @@ spec:
                     collectEvents:
                       description: 'Enables this to start event collection from the Kubernetes API. See also: https://docs.datadoghq.com/agent/kubernetes/event_collection/'
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for the Agent container
+                      items:
+                        type: string
+                      type: array
                     confd:
                       description: Confd configuration allowing to specify config files for custom checks placed under /etc/datadog-agent/conf.d/. See https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6 for more details.
                       properties:
@@ -1822,6 +1842,16 @@ spec:
                 process:
                   description: Process Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Process Agent container
+                      items:
+                        type: string
+                      type: array
                     enabled:
                       description: 'Note: /etc/passwd is automatically mounted to allow username resolution. See also: https://docs.datadoghq.com/graphing/infrastructure/process/#kubernetes-daemonset'
                       type: boolean
@@ -1969,6 +1999,16 @@ spec:
                 security:
                   description: Security Agent configuration
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Security Agent container
+                      items:
+                        type: string
+                      type: array
                     compliance:
                       description: Compliance configuration.
                       properties:
@@ -2141,12 +2181,22 @@ spec:
                     appArmorProfileName:
                       description: AppArmorProfileName specify a apparmor profile.
                       type: string
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     bpfDebugEnabled:
                       description: BPFDebugEnabled logging for kernel debug.
                       type: boolean
                     collectDNSStats:
                       description: CollectDNSStats enables DNS stat collection.
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for System Probe container
+                      items:
+                        type: string
+                      type: array
                     conntrackEnabled:
                       description: 'ConntrackEnabled enable the system-probe agent to connect to the netlink/conntrack subsystem to add NAT information to connection data. See also: http://conntrack-tools.netfilter.org/'
                       type: boolean
@@ -2732,12 +2782,22 @@ spec:
                           description: ServiceName corresponds to the webhook service name.
                           type: string
                       type: object
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
                     clusterChecksEnabled:
                       description: 'Enable the Cluster Checks and Endpoint Checks feature on both the cluster-agents and the daemonset. See also: https://docs.datadoghq.com/agent/cluster_agent/clusterchecks/ https://docs.datadoghq.com/agent/cluster_agent/endpointschecks/ Autodiscovery via Kube Service annotations is automatically enabled.'
                       type: boolean
                     collectEvents:
                       description: 'Enable this to start event collection from the kubernetes API. See also: https://docs.datadoghq.com/agent/cluster_agent/event_collection/'
                       type: boolean
+                    command:
+                      description: Command allows the specification of custom entrypoint for Cluster Agent container
+                      items:
+                        type: string
+                      type: array
                     confd:
                       description: Confd Provide additional cluster check configurations. Each key will become a file in /conf.d. see https://docs.datadoghq.com/agent/autodiscovery/ for more details.
                       properties:
@@ -4294,6 +4354,16 @@ spec:
                 config:
                   description: Agent configuration.
                   properties:
+                    args:
+                      description: Args allows the specification of extra args to `Command` parameter
+                      items:
+                        type: string
+                      type: array
+                    command:
+                      description: Command allows the specification of custom entrypoint for Cluster Checks Runner container
+                      items:
+                        type: string
+                      type: array
                     env:
                       description: 'The Datadog Agent supports many environment variables. See also: https://docs.datadoghq.com/agent/docker/?tab=standard#environment-variables'
                       items:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,6 +3,6 @@ resources:
 images:
 - name: controller
   newName: gcr.io/datadoghq/operator
-  newTag: 0.6.0-rc.6
+  newTag: 0.6.0-rc.7
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/hack/redhat-bundle.sh b/hack/redhat-bundle.sh
@@ -4,8 +4,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source "$(dirname $0)/os-env.sh"
-
 ROOT=$(git rev-parse --show-toplevel)
 RH_BUNDLE_PATH="$ROOT/bundle-redhat"
 RH_BUNDLE_DOCKERFILE="$ROOT/bundle.redhat.Dockerfile"
@@ -27,13 +25,13 @@ LABEL com.redhat.delivery.operator.bundle=true
 LABEL com.redhat.delivery.backport=true
 EOF
 
-$SED 's/operators.operatorframework.io.bundle.package.v1=datadog-operator/operators.operatorframework.io.bundle.package.v1=datadog-operator-certified/g' "$RH_BUNDLE_DOCKERFILE"
-$SED 's#COPY bundle/#COPY bundle-redhat/#g' "$RH_BUNDLE_DOCKERFILE"
+sed -i 's/operators.operatorframework.io.bundle.package.v1=datadog-operator/operators.operatorframework.io.bundle.package.v1=datadog-operator-certified/g' "$RH_BUNDLE_DOCKERFILE"
+sed -i 's#COPY bundle/#COPY bundle-redhat/#g' "$RH_BUNDLE_DOCKERFILE"
 
 # Patch annotations.yaml
-$SED 's/operators.operatorframework.io.bundle.package.v1: datadog-operator/operators.operatorframework.io.bundle.package.v1: datadog-operator-certified/g' "$RH_BUNDLE_PATH/metadata/annotations.yaml"
+sed -i 's/operators.operatorframework.io.bundle.package.v1: datadog-operator/operators.operatorframework.io.bundle.package.v1: datadog-operator-certified/g' "$RH_BUNDLE_PATH/metadata/annotations.yaml"
 
 # Patch CSV
-$SED 's#image: datadog/operator:#image: registry.connect.redhat.com/datadog/operator:#g' "$RH_BUNDLE_PATH/manifests/datadog-operator.clusterserviceversion.yaml"
+sed -i 's#image: datadog/operator:#image: registry.connect.redhat.com/datadog/operator:#g' "$RH_BUNDLE_PATH/manifests/datadog-operator.clusterserviceversion.yaml"
 # Patch images in DatadogAgent examples for bundle validation
-$SED 's#gcr.io/datadoghq/#datadog/#g' "$RH_BUNDLE_PATH/manifests/datadog-operator.clusterserviceversion.yaml"
+sed -i 's#gcr.io/datadoghq/#datadog/#g' "$RH_BUNDLE_PATH/manifests/datadog-operator.clusterserviceversion.yaml"