Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

linkerd: Upgrade to latest stable #1123

Merged
merged 6 commits into from
Nov 24, 2020
Merged

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Oct 23, 2020

  • Upgrade to latest stable: stable-2.9.0
  • Update the expiry date format to RFC3339. So that linkerd does not complain about parsing errors.
  • Update the values-ha file as per the upstream configs.
  • Disable inbuilt grafana and prometheus.
  • Include the prometheus config as provided by upstream.

Fixes #896

@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch 2 times, most recently from 8961b80 to 1a94f3a Compare October 28, 2020 07:25
@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from 1a94f3a to 7564dde Compare November 9, 2020 13:15
@surajssd
Copy link
Member Author

surajssd commented Nov 9, 2020

TODO:

@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from 7564dde to bbee9ba Compare November 9, 2020 13:52
@surajssd surajssd changed the title linkerd: Upgrade to edge linkerd: Upgrade to latest stable Nov 9, 2020
@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from bbee9ba to 86a2cf3 Compare November 10, 2020 14:19
@surajssd surajssd marked this pull request as ready for review November 10, 2020 14:19
@surajssd
Copy link
Member Author

surajssd commented Nov 10, 2020

  • Add docs.

@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from 86a2cf3 to cae75e6 Compare November 11, 2020 10:19
@surajssd surajssd requested review from invidian and ipochi November 11, 2020 10:20
Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

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

Just some nits, otherwise looks good to me.

pkg/components/linkerd/component.go Show resolved Hide resolved
pkg/components/linkerd/component.go Show resolved Hide resolved
docs/configuration-reference/components/linkerd.md Outdated Show resolved Hide resolved
docs/configuration-reference/components/linkerd.md Outdated Show resolved Hide resolved
@surajssd surajssd requested a review from invidian November 20, 2020 12:07
@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from cae75e6 to ab04882 Compare November 20, 2020 12:07
Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

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

We could also mention in the commit message or code comment (or both) that date format change is a workaround until we update linkerd dependency.

docs/configuration-reference/components/linkerd.md Outdated Show resolved Hide resolved
@surajssd surajssd force-pushed the surajssd/upgrade-linkerd2 branch from ab04882 to 1ae435a Compare November 23, 2020 08:57
@surajssd surajssd requested a review from invidian November 23, 2020 08:58
invidian
invidian previously approved these changes Nov 23, 2020
Copy link
Member

@invidian invidian left a comment

Choose a reason for hiding this comment

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

LGTM

Update to app version: `2.9.0`.
Release Notes: https://github.com/linkerd/linkerd2/releases/tag/stable-2.9.0

Signed-off-by: Suraj Deshmukh <[email protected]>
This commit changes the expiry date format from the golang's default to
`RFC3339`. This change is introduced because the proxy injector errors
with following errors:

```
failed to inject sidecar. Reason: failed to unmarshal JSON from:
/var/run/linkerd/config/values: error unmarshaling JSON: while decoding
JSON: parsing time "2021-11-09 07:43:12 +0000 UTC" as
"2006-01-02T15:04:05Z07:00": cannot parse " 07:43:12 +0000 UTC" as "T"
```

This problem should be fixed once we update the linkerd libs, and it
would be safe to revert this commit.

Signed-off-by: Suraj Deshmukh <[email protected]>
This commit updates the values file for HA setup to match upstream
config.

Signed-off-by: Suraj Deshmukh <[email protected]>
- Add new variable `prometheus_url` where user can provide the link to
  the external prometheus from where linkerd can scrape the metrics.

Signed-off-by: Suraj Deshmukh <[email protected]>
This commit includes relabel config from the prometheus config mentioned
in: https://linkerd.io/2/tasks/external-prometheus/.

Signed-off-by: Suraj Deshmukh <[email protected]>
@surajssd surajssd merged commit 9018f80 into master Nov 24, 2020
@surajssd surajssd deleted the surajssd/upgrade-linkerd2 branch November 24, 2020 08:16
@invidian invidian mentioned this pull request Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add linkerd reference documentation
2 participants