diff --git a/.gitignore b/.gitignore index 823c59accd4..a4dd64d90e0 100644 --- a/.gitignore +++ b/.gitignore @@ -168,6 +168,7 @@ content/en/containers/datadog_operator/data_collected.md content/en/containers/datadog_operator/secret_management.md content/en/containers/guide/v2alpha1_migration.md content/en/containers/datadog_operator/kubectl_plugin.md +content/en/containers/datadog_operator/migration.md # serverless content/en/serverless/libraries_integrations/plugin.md diff --git a/config/_default/menus/main.en.yaml b/config/_default/menus/main.en.yaml index fe8258a2c43..006403612e4 100644 --- a/config/_default/menus/main.en.yaml +++ b/config/_default/menus/main.en.yaml @@ -3114,71 +3114,76 @@ menu: parent: containers_kubernetes identifier: containers_kubernetes_installation weight: 401 + - name: Migrate to the Datadog Operator + url: containers/kubernetes/migration + parent: containers_kubernetes + identifier: containers_kubernetes_datadog_operator_migration + weight: 402 - name: Further Configuration url: containers/kubernetes/configuration parent: containers_kubernetes identifier: containers_kubernetes_configuration - weight: 402 + weight: 403 - name: Distributions url: containers/kubernetes/distributions parent: containers_kubernetes identifier: containers_kubernetes_distributions - weight: 403 + weight: 404 - name: APM url: containers/kubernetes/apm/ parent: containers_kubernetes identifier: containers_kubernetes_apm - weight: 404 + weight: 405 - name: App and API Protection url: containers/kubernetes/appsec/ parent: containers_kubernetes identifier: containers_kubernetes_appsec - weight: 405 + weight: 406 - name: Log collection url: containers/kubernetes/log/ parent: containers_kubernetes identifier: containers_kubernetes_log - weight: 406 + weight: 407 - name: Tag extraction url: containers/kubernetes/tag/ parent: containers_kubernetes identifier: containers_kubernetes_tag - weight: 407 + weight: 408 - name: Integrations url: containers/kubernetes/integrations/ parent: containers_kubernetes identifier: containers_kubernetes_integrations - weight: 408 + weight: 409 - name: Prometheus & OpenMetrics url: containers/kubernetes/prometheus/ parent: containers_kubernetes identifier: containers_kubernetes_prometheus - weight: 409 + weight: 410 - name: Control plane monitoring url: containers/kubernetes/control_plane/ parent: containers_kubernetes identifier: containers_kubernetes_control_plane - weight: 410 + weight: 411 - name: Data collected url: containers/kubernetes/data_collected/ parent: containers_kubernetes identifier: containers_kubernetes_data_collected - weight: 411 + weight: 412 - name: kubectl Plugin url: containers/kubernetes/kubectl_plugin parent: containers_kubernetes identifier: containers_kubernetes_kubectlplugin - weight: 412 + weight: 413 - name: Datadog CSI Driver url: containers/kubernetes/csi_driver parent: containers_kubernetes identifier: csi_driver - weight: 413 + weight: 414 - name: Data security url: data_security/kubernetes parent: containers_kubernetes identifier: container_kubernetes_data_security - weight: 414 + weight: 415 - name: Cluster Agent url: containers/cluster_agent/ parent: containers @@ -3249,26 +3254,31 @@ menu: identifier: containers_datadog_operator parent: containers weight: 8 + - name: Migrate to the Datadog Operator + url: containers/datadog_operator/migration + parent: containers_datadog_operator + identifier: containers_datadog_operator_migration + weight: 801 - name: Advanced Install url: containers/datadog_operator/advanced_install identifier: containers_datadog_operator_installation parent: containers_datadog_operator - weight: 801 + weight: 802 - name: Configuration url: containers/datadog_operator/config identifier: containers_datadog_operator_configuration parent: containers_datadog_operator - weight: 802 + weight: 803 - name: Custom Checks url: containers/datadog_operator/custom_check identifier: containers_datadog_operator_customchecks parent: containers_datadog_operator - weight: 803 + weight: 804 - name: Data Collected url: containers/datadog_operator/data_collected identifier: containers_datadog_operator_datacollected parent: containers_datadog_operator - weight: 804 + weight: 805 - name: Secret Management url: containers/datadog_operator/secret_management identifier: containers_datadog_operator_secretmanagement diff --git a/content/en/containers/kubernetes/migration.md b/content/en/containers/kubernetes/migration.md new file mode 100644 index 00000000000..90f45fdeb1a --- /dev/null +++ b/content/en/containers/kubernetes/migration.md @@ -0,0 +1,5 @@ +--- +title: Migrate to the Datadog Operator from the Datadog Helm Chart +--- + +{{< include-markdown "containers/datadog_operator/migration" >}} \ No newline at end of file diff --git a/local/bin/py/build/configurations/pull_config.yaml b/local/bin/py/build/configurations/pull_config.yaml index ae0c4160995..8991eb2443c 100644 --- a/local/bin/py/build/configurations/pull_config.yaml +++ b/local/bin/py/build/configurations/pull_config.yaml @@ -513,6 +513,20 @@ title: Migrate DatadogAgent CRDs to v2alpha1 dependencies: ["https://github.com/DataDog/datadog-operator/blob/main/docs/v2alpha1_migration.md"] + - repo_name: helm-charts + contents: + - action: pull-and-push-file + branch: main + globs: + - 'charts/datadog/docs/Migration_Helm_to_Operator.md' + options: + dest_path: '/containers/datadog_operator/' + file_name: 'migration.md' + front_matters: + title: Migrate to the Datadog Operator from the Datadog Helm Chart + description: "Migrate the Datadog Helm installation to the Datadog Operator for managing Datadog Agent deployments" + dependencies: [ "https://github.com/DataDog/helm-charts/blob/main/charts/datadog/docs/Migration_Helm_to_Operator.md" ] + - repo_name: dd-trace-rb contents: - action: pull-and-push-file diff --git a/local/bin/py/build/configurations/pull_config_preview.yaml b/local/bin/py/build/configurations/pull_config_preview.yaml index 38c346c4195..2b342b10514 100644 --- a/local/bin/py/build/configurations/pull_config_preview.yaml +++ b/local/bin/py/build/configurations/pull_config_preview.yaml @@ -512,6 +512,21 @@ front_matters: title: Migrate DatadogAgent CRDs to v2alpha1 dependencies: ["https://github.com/DataDog/datadog-operator/blob/main/docs/v2alpha1_migration.md"] + + - repo_name: helm-charts + contents: + - action: pull-and-push-file + branch: main + globs: + - 'charts/datadog/docs/Migration_Helm_to_Operator.md' + options: + dest_path: '/containers/datadog_operator/' + file_name: 'migration.md' + front_matters: + title: Migrate to the Datadog Operator from the Datadog Helm Chart + description: "Migrate the Datadog Helm installation to the Datadog Operator for managing Datadog Agent deployments" + dependencies: [ "https://github.com/DataDog/helm-charts/blob/main/charts/datadog/docs/Migration_Helm_to_Operator.md" ] + - repo_name: dd-trace-rb contents: - action: pull-and-push-file