Skip to content

Fix teleport.e integrations builds#35996

Merged
hugoShaka merged 2 commits intomasterfrom
hugo/fix-spacelift-build
Dec 27, 2023
Merged

Fix teleport.e integrations builds#35996
hugoShaka merged 2 commits intomasterfrom
hugo/fix-spacelift-build

Conversation

@hugoShaka
Copy link
Copy Markdown
Contributor

This PR fixes 2 builds that were broken by #35150:

  • spacelift integration (fixed by moving the automaticupgrades code from integrations/kube-agent-updater to lib/automaticupgrades)
  • kube-agent-updater (fixed by editing the Dockerfile and the Makefile to include lib/ in the context)

@hugoShaka hugoShaka requested a review from wadells December 21, 2023 22:34
@hugoShaka hugoShaka changed the title Hugo/fix spacelift build Fix teleport.e integrations builds Dec 21, 2023
@github-actions
Copy link
Copy Markdown
Contributor

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@hugoShaka hugoShaka added the no-changelog Indicates that a PR does not require a changelog entry label Dec 21, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from wadells December 22, 2023 08:49
@wadells wadells self-requested a review December 22, 2023 19:52
@wadells
Copy link
Copy Markdown
Contributor

wadells commented Dec 22, 2023

Running a dev build (that I need for other reasons) that includes this fix:

https://drone.platform.teleport.sh/gravitational/teleport/32077

If that comes back clean, I'll merge this.

Edit: the build was not clean: https://github.com/gravitational/teleport.e/actions/runs/7303390879/job/19903808087

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from wadells December 23, 2023 16:19
@hugoShaka
Copy link
Copy Markdown
Contributor Author

hugoShaka commented Dec 27, 2023

Edit: the build was not clean: https://github.com/gravitational/teleport.e/actions/runs/7303390879/job/19903808087

We'll need to edit the teleport.e pipeline to change the docker build context for the teleport-kube-agent (it now depends on teleport and needs the full repo in its context).

I'll merge this PR and send the e fix

@hugoShaka hugoShaka added this pull request to the merge queue Dec 27, 2023
@hugoShaka
Copy link
Copy Markdown
Contributor Author

Merged via the queue into master with commit 54ede1e Dec 27, 2023
@hugoShaka hugoShaka deleted the hugo/fix-spacelift-build branch December 27, 2023 14:59
bernardjkim pushed a commit that referenced this pull request Jan 3, 2024
* Move automaticupgrades packages in `lib/automaticupgrades`

* Fix `kube-agent-udpater` Dockerfile
bernardjkim pushed a commit that referenced this pull request Jan 5, 2024
* Move automaticupgrades packages in `lib/automaticupgrades`

* Fix `kube-agent-udpater` Dockerfile
github-merge-queue Bot pushed a commit that referenced this pull request Jan 8, 2024
* Add a version server in the proxy + use it in agent chart (#35150)

This PR adds an embedded [version server](https://goteleport.com/docs/architecture/agent-update-management/#version-server-and-source-of-truth) in the proxy to address: gravitational/cloud#6773

The version server can be configured through `teleport.yaml`:

```yaml
proxy_service:
  enabled: "yes"
  automatic_upgrades_channels:
    stable/cloud:
      forward_url: https://updates.releases.teleport.dev/v1/stable/cloud
    preview/cloud:
      static_version: v12.5.4
```

The forwarded call results are cached for a minute.

* automatic upgrades: use default version channel everywhere (#35342)

* Use default upgrade channel

This commit:
- initializes default upgrade channels based on the server features
- makes all integrations use the upgrade channels instead of hitting
  hardcoded s3 bucket
- makes the version channel return its own version if the target
  version is too high
- makes the NoVersion handler properly: returned as an error. This way
  soneone relying on the version getter doesn't have to check
- moves the version kube-agent-updater lib in main teleport libs
- add tests for noVersion channels

* Update lib/web/join_tokens.go

Co-authored-by: Bernard Kim <bernard@goteleport.com>

* address marco's feedback

* address marco's feedback pt.2

---------

Co-authored-by: Bernard Kim <bernard@goteleport.com>

* Fix teleport.e integrations builds (#35996)

* Move automaticupgrades packages in `lib/automaticupgrades`

* Fix `kube-agent-udpater` Dockerfile

* Write handler config (#35998)

* go mod tidy

* Bump controller-runtime v0.16.3

* Use channel

---------

Co-authored-by: Hugo Shaka <hugo.hervieux@goteleport.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants