Remove symbolic links to old binary names (#3628) (#3631)

Signed-off-by: Paschalis Tsilias <[email protected]>
(cherry picked from commit 397aa21)

Co-authored-by: Paschalis Tsilias <[email protected]>

Author: grafanabot

CHANGELOG.md

@@ -39,6 +39,9 @@ v0.33.0-rc.0 (2023-04-20)
 - Agent Management: `agent_management.remote_config_cache_location` config field has been replaced by
 `agent_management.remote_configuration.cache_location`. (@jcreixell)
 
+- Remove deprecated symbolic links to to `/bin/agent*` in Docker containers,
+  as planned in v0.31. (@tpaschalis)
+
 ### Deprecations
 
 - [Dynamic Configuration](https://grafana.com/docs/agent/latest/cookbook/dynamic-configuration/) will be removed in v0.34. Grafana Agent Flow supersedes this functionality. (@mattdurham)

cmd/grafana-agent-operator/Dockerfile

@@ -34,5 +34,4 @@ RUN <<EOF
 EOF
 
 COPY --from=build /src/agent/build/grafana-agent-operator /bin/grafana-agent-operator
-RUN ln -sv /bin/grafana-agent-operator /bin/agent-operator
 ENTRYPOINT ["/bin/grafana-agent-operator"]

cmd/grafana-agent/Dockerfile

@@ -43,7 +43,6 @@ EOF
 COPY --from=build /src/agent/build/grafana-agent /bin/grafana-agent
 COPY cmd/grafana-agent/agent-local-config.yaml /etc/agent/agent.yaml
 
-RUN ln -sv /bin/grafana-agent /bin/agent
 
 ENTRYPOINT ["/bin/grafana-agent"]
 CMD ["--config.file=/etc/agent/agent.yaml", "--metrics.wal-directory=/etc/agent/data"]

cmd/grafana-agentctl/Dockerfile

@@ -35,5 +35,4 @@ RUN <<EOF
 EOF
 
 COPY --from=build /src/agent/build/grafana-agentctl /bin/grafana-agentctl
-RUN ln -sv /bin/grafana-agentctl /bin/agentctl
-ENTRYPOINT ["/bin/agentctl"]
+ENTRYPOINT ["/bin/grafana-agentctl"]

docs/sources/flow/upgrade-guide.md

@@ -18,6 +18,14 @@ Grafana Agent Flow.
 > [upgrade-guide-static]: {{< relref "../static/upgrade-guide.md" >}}
 > [upgrade-guide-operator]: {{< relref "../operator/upgrade-guide.md" >}}
 
+## v0.33.0 
+
+### Symbolic links in Docker containers removed
+
+We've removed the deprecated symbolic links to `/bin/agent*` in Docker
+containers, as planned in v0.31. In case you're setting a custom entrypoint,
+use the new binaries that are prefixed with `/bin/grafana*`.
+
 ## v0.32.0
 
 ### Breaking change: `http_client_config` Flow blocks merged with parent blocks

docs/sources/operator/upgrade-guide.md

@@ -18,6 +18,14 @@ Static mode Kubernetes operator.
 > [upgrade-guide-static]: {{< relref "../static/upgrade-guide.md" >}}
 > [upgrade-guide-flow]: {{< relref "../flow/upgrade-guide.md" >}}
 
+## v0.33.0
+
+### Symbolic links in Docker containers removed
+
+We've removed the deprecated symbolic links to `/bin/agent*` in Docker
+containers, as planned in v0.31. In case you're setting a custom entrypoint,
+use the new binaries that are prefixed with `/bin/grafana*`.
+
 ## v0.31.0
 
 ### Breaking change: binary names are now prefixed with `grafana-`

docs/sources/static/upgrade-guide.md

@@ -19,7 +19,13 @@ static mode.
 > [upgrade-guide-operator]: {{< relref "../operator/upgrade-guide.md" >}}
 > [upgrade-guide-flow]: {{< relref "../flow/upgrade-guide.md" >}}
 
-## v0.33
+## v0.33.0
+
+### Symbolic links in Docker containers removed
+
+We've removed the deprecated symbolic links to `/bin/agent*` in Docker
+containers, as planned in v0.31. In case you're setting a custom entrypoint,
+use the new binaries that are prefixed with `/bin/grafana*`.
 
 ### Deprecation of Dynamic Configuration