Skip to content
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

Fixing name of custom conf file mounted in DCA during migration #701

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

CharlyF
Copy link
Contributor

@CharlyF CharlyF commented Jan 31, 2023

What does this PR do?

Upon converting v1alpha1 with a customConfig for the cluster agent, the file should be datadog-cluster.yaml so that it's properly processed by the binary.

currently we have:

      volumes:
      - configMap:
          defaultMode: 420
          items:
          - key: datadog-cluster.yaml
            path: datadog-cluster.yaml
          name: datadog-cluster-agent-custom-cm
        name: volume-custom-cluster-agent
...
        volumeMounts:
        - mountPath: /etc/datadog-agent/datadog.yaml
          name: volume-custom-cluster-agent
          readOnly: true
          subPath: datadog.yaml

with the wrong subPath.
leading to the /etc/datadog-agent/datadog.yaml being a directory since it's empty.

root@datadog-cluster-agent-56885cc567-bhmgm:/# cat /etc/datadog-agent/datadog.yaml
cat: /etc/datadog-agent/datadog.yaml/: Is a directory

Motivation

Fix edge case of migration.

Additional Notes

Anything else we should know when reviewing?

Describe your test plan

Write there any instructions and details you may have to test your PR.

@CharlyF CharlyF added the bug Something isn't working label Jan 31, 2023
@CharlyF CharlyF added this to the v1.0.0 milestone Jan 31, 2023
@CharlyF CharlyF requested review from a team as code owners January 31, 2023 15:21
@CharlyF CharlyF merged commit c977a8e into main Feb 1, 2023
@CharlyF CharlyF deleted the charly/fix-conversion-customconf branch February 1, 2023 14:30
CharlyF pushed a commit that referenced this pull request Feb 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants