Merge pull request #3814 from telepresenceio/thallgren/decouple-getambassador

Unify annotations, labels, and download links

Author: thallgren

.github/workflows/dev.yaml

@@ -133,9 +133,9 @@ jobs:
       - uses: ./.github/actions/upload-logs
         env:
           LOG_SUFFIX: "${{ runner.os }}-${{ runner.arch }}-${{ matrix.clusters.distribution }}-${{ matrix.clusters.version }}"
-        if: always()
+        if: ${{ always() }}
   purge_images:
-    if: github.event.label.name == 'ok to test' || github.event.label.name == 'compatibility test'
+    if: ${{ always() }}
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -146,7 +146,6 @@ jobs:
       - name: Delete tel2 and telepresence image
         uses: dataaxiom/ghcr-cleanup-action@v1
         continue-on-error: true
-        if: always()
         with:
           owner: telepresenceio
           packages: tel2,telepresence
@@ -158,6 +157,7 @@ jobs:
           owner: telepresenceio
           packages: tel2,telepresence
           token: ${{ secrets.GITHUB_TOKEN }}
+          delete-untagged: true
           delete-ghost-images: true
           delete-partial-images: true
           delete-orphaned-images: true

.github/workflows/release.yaml

@@ -94,15 +94,17 @@ jobs:
       - name: Determine if version is RC, TEST, or GA
         id: semver_check
         run: |
-          if [[ "${{ github.ref_name }}" =~ ^v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+$ ]]; then
+          v=${{ github.ref_name }}
+          echo "semver=${v#v}" >> "$GITHUB_OUTPUT"
+          if [[ "${v}" =~ ^v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+$ ]]; then
             echo "make_latest=false" >> $GITHUB_OUTPUT
             echo "draft=false" >> $GITHUB_OUTPUT
             echo "prerelease=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.ref_name }}" =~ ^v[0-9]+.[0-9]+.[0-9]+-test.[0-9]+$ ]]; then
+          elif [[ "${v}" =~ ^v[0-9]+.[0-9]+.[0-9]+-test.[0-9]+$ ]]; then
             echo "make_latest=false" >> $GITHUB_OUTPUT
             echo "draft=false" >> $GITHUB_OUTPUT
             echo "prerelease=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.ref_name }}" =~ ^v[0-9]+.[0-9]+.[0-9]+-draft.[0-9]+$ ]]; then
+          elif [[ "${v}" =~ ^v[0-9]+.[0-9]+.[0-9]+-draft.[0-9]+$ ]]; then
             echo "make_latest=false" >> $GITHUB_OUTPUT
             echo "draft=true" >> $GITHUB_OUTPUT
             echo "prerelease=false" >> $GITHUB_OUTPUT
@@ -134,26 +136,26 @@ jobs:
           body: |
             ## Official Release Artifacts
             ### Linux
-               - 📦 [telepresence-linux-amd64](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-linux-amd64)
-               - 📦 [telepresence-linux-arm64](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-linux-arm64)
+               - 📦 [telepresence-linux-amd64](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-linux-amd64)
+               - 📦 [telepresence-linux-arm64](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-linux-arm64)
             ### OSX Darwin
-               - 📦 [telepresence-darwin-amd64](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-darwin-amd64)
-               - 📦 [telepresence-darwin-arm64](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-darwin-arm64)
+               - 📦 [telepresence-darwin-amd64](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-darwin-amd64)
+               - 📦 [telepresence-darwin-arm64](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-darwin-arm64)
             ### Windows
-               - 📦 [telepresence-windows-amd64.zip](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-windows-amd64.zip)
-               - 📦 [telepresence-windows-arm64.zip](https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}/telepresence-windows-arm64.zip)
+               - 📦 [telepresence-windows-amd64.zip](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-windows-amd64.zip)
+               - 📦 [telepresence-windows-arm64.zip](https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}/telepresence-windows-arm64.zip)
 
-            For more builds across platforms and architectures, see the `Assets` section below.
-            And for more information, visit our [installation docs](https://www.telepresence.io/docs/quick-start/).
+            ### Helm Chart
+               - 📦 [Telepresence Helm Chart](https://artifacthub.io/packages/helm/telepresence-oss/telepresence-oss/${{ steps.semver_check.outputs.semver }})
 
-            ![Assets](https://static.scarf.sh/a.png?x-pxid=d842651a-2e4d-465a-98e1-4808722c01ab)
+            For more information, visit our [installation docs](https://www.telepresence.io/docs/quick-start/).
       - uses: actions/checkout@v4
         if: ${{ steps.semver_check.outputs.make_latest == 'true' }}
       - name: Update Homebrew
         if: ${{ steps.semver_check.outputs.make_latest == 'true' }}
         run: |
           v=${{ github.ref_name }}
-          packaging/homebrew-package.sh "${v#v}" tel2oss "${{ vars.GH_BOT_USER }}" "${{ vars.GH_BOT_EMAIL }}" "${{ secrets.HOMEBREW_TAP_TOKEN }}"
+          packaging/homebrew-package.sh "${v#v}" "${{ vars.GH_BOT_USER }}" "${{ vars.GH_BOT_EMAIL }}" "${{ secrets.HOMEBREW_TAP_TOKEN }}"
 
   test-release:
     needs:
@@ -174,7 +176,7 @@ jobs:
     steps:
       - name: download binary
         env:
-          DOWNLOAD_URL: "https://app.getambassador.io/download/tel2oss/releases/download/${{ github.ref_name }}"
+          DOWNLOAD_URL: "https://github.com/telepresenceio/telepresence/releases/download/${{ github.ref_name }}"
         shell: bash
         run: |
           if [ "${{ runner.os }}" = "macOS" ]; then

CHANGELOG.yml

@@ -109,6 +109,18 @@ items:
         body: >-
           Users can now use the Helm value `agent.initSecurityContext` to override the default securityContext for the
           Telepresence init-container.
+      - type: change
+        title: Let download page use direct links to GitHub
+        body: >-
+          The download links on the release page now points directly to the assets on the download page, instead of
+          using being routed from getambassador.io/download/tel2oss/releases.
+      - type: change
+        title: Use telepresence.io as annotation prefix instead of telepresence.getambassador.io
+        body: >-
+          The workload and pod annotations used by Telepresence will now use the prefix `telepresence.io` instead of
+          `telepresence.getambassador.io`. The new prefix is consistent with the prefix used by labels, and it also
+          matches the host name of the documentation site. Annotations using the old name will still work, but warnings
+          will be logged when they are encountered.
       - type: change
         title: Make the DNS recursion check configurable and turn it off by default.
         body: >-

DEPENDENCIES.md

@@ -129,8 +129,8 @@ following Free and Open Source software:
     github.com/spf13/cobra                                         v1.8.1                                Apache License 2.0
     github.com/spf13/pflag                                         v1.0.6                                3-clause BSD license
     github.com/stretchr/testify                                    v1.10.0                               MIT license
-    github.com/telepresenceio/go-fuseftp                           v0.6.2                                Apache License 2.0
-    github.com/telepresenceio/go-fuseftp/rpc                       v0.6.2                                Apache License 2.0
+    github.com/telepresenceio/go-fuseftp                           v0.6.4                                Apache License 2.0
+    github.com/telepresenceio/go-fuseftp/rpc                       v0.6.4                                Apache License 2.0
     github.com/telepresenceio/telepresence/rpc/v2                  (modified)                            Apache License 2.0
     github.com/vishvananda/netlink                                 v1.3.0                                Apache License 2.0
     github.com/vishvananda/netns                                   v0.0.5                                Apache License 2.0

README.md

@@ -28,10 +28,6 @@ A few quick ways to start using Telepresence:
 * **Contributor's Guide:** [Guide](https://github.com/telepresenceio/telepresence/blob/release/v2/CONTRIBUTING.md)
 * **Meetings:** Check out our community [meeting schedule](https://github.com/telepresenceio/telepresence/blob/release/v2/MEETING_SCHEDULE.md) for opportunities to interact with Telepresence developers
 
-## Enterprise Version
-
-Find out more about Telepresence Enterprise and related products at [getambassador.io](https://www.getambassador.io/products/telepresence).
-
 ## Walkthrough
 
 ### Install an interceptable service:
@@ -230,8 +226,8 @@ Labels:           app=hello
                   pod-template-hash=75b7c6d484
                   telepresence.io/workloadEnabled=true
                   telepresence.io/workloadName=hello
-Annotations:      telepresence.getambassador.io/inject-traffic-agent: enabled
-                  telepresence.getambassador.io/restartedAt: 2024-01-07T00:01:33Z
+Annotations:      telepresence.io/inject-traffic-agent: enabled
+                  telepresence.io/restartedAt: 2024-01-07T00:01:33Z
 Status:           Running
 IP:               10.244.0.89
 IPs:
@@ -427,8 +423,6 @@ When a locally running application makes a network request to a service in the c
 The operating system then sees that the TUN device has an address in the same subnet as the address of the outgoing packets and sends them to `tel0`.
 Telepresence is on the other side of `tel0` and picks up the packets, injecting them into the cluster through a gRPC connection with Traffic Manager.
 
-For a more in-depth overview, checkout our blog post: [Implementing Telepresence Networking with a TUN device](https://blog.getambassador.io/implementing-telepresence-networking-with-a-tun-device-a23a786d51e9)
-
 ## Troubleshooting
 
 Visit the troubleshooting section in the Telepresence documentation for more advice:

build-aux/admission_controller_tls/main.go

@@ -83,7 +83,7 @@ func generateKeyTriplet(mgrNamespace string) (crtPem, keyPem, caPem []byte, err
 	caCert := &x509.Certificate{
 		SerialNumber: big.NewInt(0xefecab0),
 		Subject: pkix.Name{
-			Organization: []string{"getambassador.io"},
+			Organization: []string{"telepresence.io"},
 		},
 		NotBefore:             time.Now(),
 		NotAfter:              time.Now().AddDate(1, 0, 0),
@@ -114,7 +114,7 @@ func generateKeyTriplet(mgrNamespace string) (crtPem, keyPem, caPem []byte, err
 		SerialNumber: big.NewInt(0xefecab1),
 		Subject: pkix.Name{
 			CommonName:   commonName,
-			Organization: []string{"getambassador.io"},
+			Organization: []string{"telepresence.io"},
 		},
 		NotBefore:    time.Now(),
 		NotAfter:     time.Now().AddDate(10, 0, 0), // Valid 10 years

build-aux/main.mk

@@ -359,7 +359,7 @@ promote-to-stable: ## (Release) Update stable.txt in S3
 		--body $(BUILDDIR)/stable.txt
 ifeq ($(GOHOSTOS), darwin)
 # Since the enterprise version is built from a different makefile, we only use the oss target here. Ref: https://github.com/telepresenceio/telepresence/pull/3626#issuecomment-2200150895
-	packaging/homebrew-package.sh $(TELEPRESENCE_SEMVER) "tel2oss"
+	packaging/homebrew-package.sh $(TELEPRESENCE_SEMVER)
 endif
 
 # Prerequisites:

charts/telepresence-oss/README.md

@@ -1,6 +1,6 @@
 # Telepresence
 
-[Telepresence](https://www.getambassador.io/products/telepresence/) is a tool
+[Telepresence](https://telepresence.io/) is a tool
 that allows for local development of microservices running in a remote
 Kubernetes cluster.
 
@@ -13,7 +13,7 @@ their services.
 The telepresence binary embeds the helm chart, so the easiest way to install is:
 
 ```sh
-$ telepresence helm install [--set x=y | --values <values file>]
+$ telepresence helm install [--set x=y | --values <values file>]
 ```
 
 ## Configuration

charts/telepresence-oss/templates/agentInjectorWebhook.yaml

@@ -110,7 +110,7 @@ webhooks:
     scope: '*'
   failurePolicy: {{ .Values.agentInjector.webhook.failurePolicy }}
   reinvocationPolicy: {{ .Values.agentInjector.webhook.reinvocationPolicy }}
-  name: agent-injector-{{ include "traffic-manager.namespace" $ }}.getambassador.io
+  name: agent-injector-{{ include "traffic-manager.namespace" $ }}.telepresence.io
   sideEffects: {{ .Values.agentInjector.webhook.sideEffects }}
   timeoutSeconds: {{ .Values.agentInjector.webhook.timeoutSeconds }}
   namespaceSelector:

charts/telepresence-oss/values.schema.yaml

@@ -360,7 +360,6 @@ properties:
   isCI:
     description: isCI can be set to force the traffic-manager namespace to be "ambassador"
     type: boolean
-    default: false
 
   livenessProbe:
     description: Define livenessProbe for the traffic-manager

cmd/traffic/cmd/agent/agent.go

@@ -57,7 +57,7 @@ func AppEnvironment(ctx context.Context, mounts agentconfig.MountPolicies, ag *a
 	// Add prefixed variables separately last, so that we can
 	// ensure that they have higher precedence.
 	for _, env := range osEnv {
-		if !strings.HasPrefix(env, agentconfig.EnvPrefix) && !strings.Contains(env, "_TELEPRESENCE_MOUNTS=") {
+		if !(strings.HasPrefix(env, agentconfig.EnvPrefix) || strings.HasPrefix(env, prefix)) {
 			pair := strings.SplitN(env, "=", 2)
 			if len(pair) == 2 {
 				k := pair[0]

cmd/traffic/cmd/manager/config/config.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/datawire/dlib/dlog"
 	"github.com/telepresenceio/telepresence/v2/cmd/traffic/cmd/manager/namespaces"
-	"github.com/telepresenceio/telepresence/v2/pkg/agentmap"
+	"github.com/telepresenceio/telepresence/v2/pkg/agentconfig"
 	"github.com/telepresenceio/telepresence/v2/pkg/client"
 	"github.com/telepresenceio/telepresence/v2/pkg/k8sapi"
 	"github.com/telepresenceio/telepresence/v2/pkg/labels"
@@ -26,7 +26,7 @@ const (
 	clientConfigFileName            = "client.yaml"
 	agentEnvConfigFileName          = "agent-env.yaml"
 	namespaceSelectorConfigFileName = "namespace-selector.yaml"
-	cfgConfigMapName                = agentmap.ManagerAppName
+	cfgConfigMapName                = agentconfig.ManagerAppName
 )
 
 type Watcher interface {

cmd/traffic/cmd/manager/mutator/agent_injector.go

@@ -108,7 +108,7 @@ func (a *agentInjector) Inject(ctx context.Context, req *admission.AdmissionRequ
 	dlog.Debugf(ctx, "Handling admission request %s %s.%s", req.Operation, pod.Name, pod.Namespace)
 	env := managerutil.GetEnv(ctx)
 
-	ia := pod.Annotations[agentconfig.InjectAnnotation]
+	ia := agentconfig.GetAnnotation(ctx, pod.Annotations, agentconfig.InjectAnnotation, agentconfig.LegacyInjectAnnotation)
 
 	var scx agentconfig.SidecarExt
 	switch ia {
@@ -164,7 +164,7 @@ func createPatch(ctx context.Context, config *agentconfig.Sidecar, pod *core.Pod
 	patches = addInitContainer(pod, config, patches)
 	patches, annotations = addAgentContainer(ctx, pod, config, patches)
 	patches = addPullSecrets(pod, config, patches)
-	patches = addAgentVolumes(pod, config, patches)
+	patches = addAgentVolumes(pod, patches)
 	patches = hidePorts(pod, config, patches)
 	annotations[agentconfig.InjectAnnotation] = "enabled"
 	patches = addPodAnnotations(pod, annotations, patches)
@@ -279,13 +279,13 @@ func addInitContainer(pod *core.Pod, config *agentconfig.Sidecar, patches PatchO
 	})
 }
 
-func addAgentVolumes(pod *core.Pod, ag *agentconfig.Sidecar, patches PatchOps) PatchOps {
+func addAgentVolumes(pod *core.Pod, patches PatchOps) PatchOps {
 	for _, vol := range pod.Spec.Volumes {
-		if vol.Name == agentconfig.AnnotationVolumeName {
+		if vol.Name == agentconfig.ExportsVolumeName {
 			return patches
 		}
 	}
-	avs := agentconfig.AgentVolumes(ag.AgentName, pod)
+	avs := agentconfig.AgentVolumes()
 	if len(avs) == 0 {
 		return patches
 	}