[installer] Add serviceAnnotations config to proxy
#9773
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
May 4, 2022 17:00
Allow the annotations on the service to be added to by specifying them in the experimental config.
Ensure that any annotations specified in the experimental config are present on the rendered Service.
github-actions
bot
added
team: delivery
|
@Pothulapati, just out of curiosity: Would these be the annotations we would need for the AWS/EKS load balancer as well? |
geropl
reviewed
May 4, 2022
| service.Annotations["external-dns.alpha.kubernetes.io/hostname"] = fmt.Sprintf("%s,*.%s,*.ws.%s", ctx.Config.Domain, ctx.Config.Domain, ctx.Config.Domain) | ||
| service.Annotations["cloud.google.com/neg"] = `{"exposed_ports": {"80":{},"443": {}}}` | ||
|
|
||
| for k, v := range annotations { | ||
| service.Annotations[k] = v |
easyCZ
reviewed
May 5, 2022
| require.Len(t, objects, 1, "must render only one object") | ||
|
|
||
| svc := objects[0].(*corev1.Service) | ||
| for k, v := range annotations { |
There was a problem hiding this comment.
Should be possible to use require.EqualValues(t, annotations, svc.Annotations)
There was a problem hiding this comment.
What we are checking here is slightly different; we need to check that the extra annotations are a subset of those on the rendered service. The installer hard-codes a couple of annotations too.
mrsimonemms
approved these changes
May 5, 2022
This was referenced May 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
One of the Webapp team's epics for Q2 is to use the Gitpod installer to deploy to Gitpod SaaS. In order to do that we will need to add additional configuration to the installer to make the output suitable for a SaaS deployment as opposed to a self-hosted deployment.
This PR allows for extra annotations to configured on the
proxycomponent so that we can configure GCP annotations for Gitpod SaaS.Related Issue(s)
Part of #9097
How to test
Create an installer config file containing this
experimentalsection:Get a
versions.yamlfor use with the installer:Then invoke the installer as:
The
Serviceresource forproxywill contain the extra annotation.Release Notes
Documentation
None.