Skip to content

Fix operator build#21362

Merged
r0mant merged 1 commit into
masterfrom
roman/fixoperator
Feb 7, 2023
Merged

Fix operator build#21362
r0mant merged 1 commit into
masterfrom
roman/fixoperator

Conversation

@r0mant
Copy link
Copy Markdown
Collaborator

@r0mant r0mant commented Feb 6, 2023

No description provided.

@r0mant
Copy link
Copy Markdown
Collaborator Author

r0mant commented Feb 7, 2023

Running a dev release off of branch/v12 with the same fix it looks like it does fix it: https://drone.platform.teleport.sh/gravitational/teleport/20122/27/39.

@r0mant r0mant mentioned this pull request Feb 7, 2023
@r0mant r0mant enabled auto-merge February 7, 2023 00:33
@r0mant r0mant added this pull request to the merge queue Feb 7, 2023
- 'operator/**'
- 'api/types/**'
- 'gen/**'
- 'lib/tbot/**'
Copy link
Copy Markdown
Contributor

@hugoShaka hugoShaka Feb 7, 2023

Choose a reason for hiding this comment

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

Sadly this should also contain lib/**. I think the gen/ dependency was added by a lib/something edition, which was likely a dependency of lib/tbot.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Yeah, I was also thinking we should just run operator tests on any .go source code change to be safe. It runs fast anyway. Will fix later (after release).

Merged via the queue into master with commit ea5f334 Feb 7, 2023
@r0mant r0mant deleted the roman/fixoperator branch February 7, 2023 01:38
@ravicious
Copy link
Copy Markdown
Member

I'm going to include this fix in my backports of #20810 to v10 and v11. Though I think v10 might not need it as lib/services/usagereporter.go doesn't exist on v10 but I suppose it won't hurt to backport it anyway.

@ravicious
Copy link
Copy Markdown
Member

ravicious commented Feb 8, 2023

I'm not backporting the fix to v10 in the end because teleport-operator builds fine on v10 without it and I don't want my PR to await a review from the admin team.

ravicious added a commit that referenced this pull request Feb 14, 2023
* Moved teleterm's proto files from their respective `lib/` dir to `proto/`.
* Updated `go_package` of `lib/teleterm` protobufs to match conventions
  used by `api/proto` and `proto`.
  * `lib/teleterm/api/protogen/golang/v1` before
  * `gen/proto/go/teleport/lib/teleterm/v1/` now
  * proto package name has been updated to match the new location.
* JS protobufs for now live in `gen/proto/js` in the root folder.
* Connect no longer needs to copy protobufs to its own directory.
   * Instead it uses protobufs from `gen/proto/js` so that any change
     done through `make grpc` is automatically picked up by Connect.

* Fix operator build (#21362)

---------

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants