a0e51fdfb5
### What When overriding the proxy version using annotations, the respective annotation displays the wrong information (`linkerd.io/proxy-version`). This is a simple fix to display the correct version for the annotation; instead of using the proxy image from the config for the annotation's value, we take it from the overriden values instead. Based on the discussion from #5338 I understood that when the image is updated it is reflected in the container image version but not the annotation. Alex's proposed fix seems to work like a charm so I can't really take credit for anything. I have attached below some before/after snippets of the deployments & pods. If there any additional changes required (or if I misunderstood anything) let me know and I'll gladly get it sorted :) #### Tests --- Didn't add any new tests, I built the images and just tested the annotation displays the correct version. To test: * I first injected an emojivoto-web deployment, its respective pod had the proxy version set to `dev-...`; * I then re-injected the same deployment using a different proxy version and restarted the pods, its respective pod displayed the expected annotation value `stable-2.9.0` (whereas before it would have still been `dev-...`) `Before` ``` # Deployment apiVersion: apps/v1 kind: Deployment ... template: metadata: annotations: kubectl.kubernetes.io/restartedAt: "2021-01-04T12:41:47Z" linkerd.io/inject: enabled # Pod apiVersion: v1 kind: Pod metadata: annotations: kubectl.kubernetes.io/restartedAt: "2021-01-04T12:41:47Z" linkerd.io/created-by: linkerd/proxy-injector dev-8d506317-madavid linkerd.io/identity-mode: default linkerd.io/inject: enabled linkerd.io/proxy-version: dev-8d506317-madavid ``` `After` ```sh $ linkerd inject --proxy-version stable-2.9.0 - | kubectl apply -f - # Deployment apiVersion: apps/v1 kind: Deployment ... template: metadata: annotations: config.linkerd.io/proxy-version: stable-2.9.0 # Pod apiVersion: v1 kind: Pod metadata: annotations: config.linkerd.io/proxy-version: stable-2.9.0 kubectl.kubernetes.io/restartedAt: "2021-01-04T12:41:47Z" linkerd.io/created-by: linkerd/proxy-injector dev-8d506317-madavid linkerd.io/identity-mode: default linkerd.io/inject: enabled linkerd.io/proxy-version: stable-2.9.0 # linkerd.io/proxy-version changed after injection and now matches the config (and the proxy img) ``` Fixes #5338 Signed-off-by: Matei David <matei.david.35@gmail.com> |
||
|---|---|---|
| .github | ||
| bin | ||
| charts | ||
| cli | ||
| cni-plugin | ||
| controller | ||
| grafana | ||
| jaeger | ||
| multicluster | ||
| pkg | ||
| proto | ||
| proxy-identity | ||
| test | ||
| testutil | ||
| viz | ||
| web | ||
| .dockerignore | ||
| .editorconfig | ||
| .gcp.json.enc | ||
| .gitattributes | ||
| .gitignore | ||
| .golangci.yml | ||
| .helmdocsignore | ||
| .markdownlint.yaml | ||
| .proxy-version | ||
| ADOPTERS.md | ||
| BUILD.md | ||
| CHANGES.md | ||
| CODE_OF_CONDUCT.md | ||
| CONTRIBUTING.md | ||
| DCO | ||
| Dockerfile-debug | ||
| Dockerfile-proxy | ||
| GOVERNANCE.md | ||
| LICENSE | ||
| MAINTAINERS.md | ||
| README.md | ||
| SECURITY.md | ||
| SECURITY_AUDIT.pdf | ||
| TEST.md | ||
| go.mod | ||
| go.sum | ||
| tools.go | ||
README.md
Linkerd
🎈 Welcome to Linkerd! 👋
Linkerd is an ultralight, security-first service mesh for Kubernetes. Linkerd adds critical security, observability, and reliability features to your Kubernetes stack with no code change required.
Linkerd is a Cloud Native Computing Foundation (CNCF) project.
Repo layout
This is the primary repo for the Linkerd 2.x line of development.
The complete list of Linkerd repos is:
- linkerd2: Main Linkerd 2.x repo, including control plane and CLI
- linkerd2-proxy: Linkerd 2.x data plane proxy
- linkerd2-proxy-api: Linkerd 2.x gRPC API bindings
- linkerd: Linkerd 1.x
- website: linkerd.io website (including docs for 1.x and 2.x)
Quickstart and documentation
You can run Linkerd on any modern Kubernetes cluster in a matter of seconds. See the Linkerd Getting Started Guide for how.
For more comprehensive documentation, start with the Linkerd docs. (The doc source code is available in the website repo.)
Working in this repo
BUILD.md includes general information on how to work in this repo.
We ❤️ pull requests! See CONTRIBUTING.md for info on
contributing changes.
Get involved
- Join Linkerd's user mailing list, developer mailing list, and announcements mailing list.
- Follow @Linkerd on Twitter.
- Join the Linkerd Slack.
- Join us in the regular online community meetings!
Community meetings
We host regular online meetings for contributors, adopters, maintainers, and anyone else interested to connect in a synchronous fashion. These meetings usually take place the last Wednesday of the month at 9am Pacific / 4pm UTC.
We're a friendly group, so please feel free to join us!
Code of Conduct
This project is for everyone. We ask that our users and contributors take a few minutes to review our Code of Conduct.
Security
Security Audit
A third party security audit was performed by Cure53. You can see the full report here.
License
Copyright 2020 the Linkerd Authors. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.