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

Migrate K8s quickstart manifests to tanka v2 #1437

Merged
merged 9 commits into from
Mar 21, 2022
Merged

Migrate K8s quickstart manifests to tanka v2 #1437

merged 9 commits into from
Mar 21, 2022

Conversation

hjet
Copy link
Contributor

@hjet hjet commented Feb 28, 2022

PR Description

This PR migrates the generation of K8s manifests in production/kubernetes to v2 of the Tanka jsonnet library.

Summary of changes to manifests:

  • (all) Change default Agent http port to 80 from misc other ports (8080, 12345, etc)
  • agent-bare.yaml
    • Becomes a StatefulSet (prev Deployment)
    • Add headless Service for StatefulSet
  • agent-loki.yaml
    • machine-id (journal) vol disabled by default
  • agent-traces.yaml
    • make namespace templatable
    • change svc port names (no functional change)
    • remove config generation from jsonnet (TODO in a future PR: add this to tanka/v2 jsonnet library)

Which issue(s) this PR fixes

Fixes #451

Notes to the Reviewer

Still need to test these on clusters and update docs but submitting for preliminary review
Tested manifests on a DOKS cluster

PR Checklist

  • CHANGELOG updated
  • (Agent) Documentation added

@hjet hjet marked this pull request as draft February 28, 2022 19:25
@hjet hjet changed the title [WIP] Migrate K8s quickstart manifests to tanka v2 Migrate K8s quickstart manifests to tanka v2 Feb 28, 2022
@hjet
Copy link
Contributor Author

hjet commented Feb 28, 2022

cc @rgeyer re: impact on k8s integration onboarding instructions (change default from Deployment to StatefulSet)
cc @mapno re: impact on traces quickstart changes (the config remains the same and lives in cloud docs here)

@hjet hjet marked this pull request as ready for review February 28, 2022 19:50
production/kubernetes/agent-bare.yaml Show resolved Hide resolved
production/kubernetes/agent-bare.yaml Outdated Show resolved Hide resolved
production/kubernetes/agent-bare.yaml Show resolved Hide resolved
production/kubernetes/agent-loki.yaml Show resolved Hide resolved
production/kubernetes/agent-traces.yaml Show resolved Hide resolved
production/kubernetes/agent-traces.yaml Show resolved Hide resolved
production/kubernetes/agent-traces.yaml Show resolved Hide resolved
production/kubernetes/build/build.sh Outdated Show resolved Hide resolved
@hjet
Copy link
Contributor Author

hjet commented Feb 28, 2022

I've integrated all the review comments. Note that we should hold off on merging this until the onboarding plugin instructions and docs changes are ready to go (although this is a bit of a chicken-egg situation).

Copy link
Contributor

@rgeyer rgeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge block to prevent accidental merges; feel free to dismiss once it's ready to go

@rfratto
Copy link
Member

rfratto commented Mar 16, 2022

@hjet following up on this, do you know if this is safe to merge now?

@hjet
Copy link
Contributor Author

hjet commented Mar 18, 2022

(Mostly) safe to merge per https://github.com/grafana/cloud-docs/pull/142 however it would be prudent to also restart all hosted Grafana instances to pick up the latest version of the plugin to eliminate all possible stale references to main

@hjet
Copy link
Contributor Author

hjet commented Mar 18, 2022

Going to work through the merge conflict in a bit

@hjet
Copy link
Contributor Author

hjet commented Mar 21, 2022

@rfratto just rebased, should be good to go.

i decided to use defaults for the HTTP port/server everywhere, will create issues in the cloud-docs repo to track the required config/configmap changes. those docs are versioned now (to v0.23) so will be unaffected by this, and will require more significant updates anyways upon next release (to capture change from deployment -> statefulset, etc..)

@hjet
Copy link
Contributor Author

hjet commented Mar 21, 2022

See https://github.com/grafana/cloud-docs/issues/143 for Cloud docs issue

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM % one small nit

@hjet hjet merged commit 2da56c0 into main Mar 21, 2022
@hjet hjet deleted the migrate_k8s_v2 branch March 21, 2022 17:45
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 1, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

grafana-agent-logs failing to boot on k3d
3 participants