Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Helm] update ingress templates #7132

Merged
merged 13 commits into from
Nov 16, 2023
Merged

[Helm] update ingress templates #7132

merged 13 commits into from
Nov 16, 2023

Conversation

azhavoro
Copy link
Contributor

@azhavoro azhavoro commented Nov 13, 2023

Added:

  • Generate ingress based on parameter ingress: true/false
  • Ability to configure cvat hostname using an override value file instead of the ugly --set option in helm
  • Removed some deprecated ingress specifications

Motivation and context

How has this been tested?

Checklist

  • I submit my changes into the develop branch
  • I have created a changelog fragment
  • I have updated the documentation accordingly
  • I have added tests to cover my changes
  • I have linked related issues (see GitHub docs)
  • I have increased versions of npm packages if it is necessary
    (cvat-canvas,
    cvat-core,
    cvat-data and
    cvat-ui)

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.

@azhavoro azhavoro changed the title updtae ingress templates [Helm] update ingress templates Nov 13, 2023
Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Merging #7132 (75e4346) into develop (8d2d1b1) will decrease coverage by 0.02%.
The diff coverage is n/a.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7132      +/-   ##
===========================================
- Coverage    81.44%   81.43%   -0.02%     
===========================================
  Files          364      364              
  Lines        39904    39904              
  Branches      3699     3699              
===========================================
- Hits         32501    32495       -6     
- Misses        7403     7409       +6     
Components Coverage Δ
cvat-ui 75.53% <ø> (-0.04%) ⬇️
cvat-server 86.95% <ø> (ø)

@azhavoro azhavoro requested a review from SpecLad November 13, 2023 12:01
helm-chart/templates/analytics/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/templates/analytics/ingress.yaml Show resolved Hide resolved
helm-chart/templates/analytics/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/templates/analytics/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/templates/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/values.yaml Outdated Show resolved Hide resolved
helm-chart/templates/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/values.yaml Outdated Show resolved Hide resolved
helm-chart/values.yaml Show resolved Hide resolved
helm-chart/Chart.yaml Show resolved Hide resolved
@SpecLad
Copy link
Contributor

SpecLad commented Nov 14, 2023

Ability to configure cvat hostname using an override value file instead of the ugly --set option in helm

Not sure what you mean by this - isn't it already possible to set any value using an override file? --set is basically the same as applying an override file with one option.

@azhavoro azhavoro requested a review from nmanovic as a code owner November 15, 2023 09:51
helm-chart/templates/analytics/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/templates/ingress.yaml Outdated Show resolved Hide resolved
helm-chart/values.yaml Outdated Show resolved Hide resolved
Comment on lines -7 to -8
traefik.ingress.kubernetes.io/router.entrypoints: web
kubernetes.io/ingress.class: traefik
Copy link
Contributor

Choose a reason for hiding this comment

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

You removed these annotations from here, but you didn't re-add them anywhere else. Is the user supposed to set them manually when enabling Traefik?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is no need to add the first line because this is the default behavior
The second line is deprecated, ingressclass is now used instead

Copy link
Contributor

@SpecLad SpecLad Nov 16, 2023

Choose a reason for hiding this comment

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

There is no need to add the first line because this is the default behavior

Okay.

The second line is deprecated, ingressclass is now used instead

Indeed, but ingress.className defaults to blank. Shouldn't it default to traefik when the traefik setting is true?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

azhavoro and others added 5 commits November 15, 2023 15:10
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
Co-authored-by: Roman Donchenko <roman@cvat.ai>
helm-chart/values.yaml Outdated Show resolved Hide resolved
@SpecLad SpecLad merged commit f1f6e78 into develop Nov 16, 2023
33 checks passed
@SpecLad SpecLad deleted the az/update_helm branch November 16, 2023 16:19
This was referenced Nov 22, 2023
SpecLad pushed a commit that referenced this pull request Nov 29, 2023
…ed (#7184)

This PR is complementary to #7132. 

#7132 updated ingress templates to work with `traefik.enabled=false` and
`ingress.enabled=true` values.

However the templates in `templates/analytics/middlewares` path lead to
creation of resources of kind `Middleware`, which is a Traefik CRD. Helm
install fails if Traefik is not installed on the cluster.

Changing the top-level conditional from `ingress.enabled` to
`traefik.enabled` solves the issue.
amjadsaadeh pushed a commit to amjadsaadeh/cvat that referenced this pull request Dec 14, 2023
…ed (cvat-ai#7184)

This PR is complementary to cvat-ai#7132. 

cvat-ai#7132 updated ingress templates to work with `traefik.enabled=false` and
`ingress.enabled=true` values.

However the templates in `templates/analytics/middlewares` path lead to
creation of resources of kind `Middleware`, which is a Traefik CRD. Helm
install fails if Traefik is not installed on the cluster.

Changing the top-level conditional from `ingress.enabled` to
`traefik.enabled` solves the issue.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants