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

fix: add missing nginx snippets for pulp_container #75

Merged
merged 1 commit into from
Mar 4, 2024

Conversation

kurokobo
Copy link
Contributor

@kurokobo kurokobo commented Mar 2, 2024

SUMMARY

Closes #74

Add missing following two snippets for configmap for nginx.conf:

  • location /v2/ with client_max_body_size 0;
  • location /pulp/container/ with proxy_pass http://galaxy-content;
ADDITIONAL INFORMATION

Tested by deploying customize Operator:

$ IMG=registry.example.com/ansible/galaxy-operator:nginx-v2 make docker-build docker-push deploy

After customized Operator is up and running, I can confirm docker push works as expeted.

$ docker push galaxy.example.com/ansible/awx-operator:latest
The push refers to repository [galaxy.example.com/ansible/awx-operator]
8a781877ae2d: Layer already exists 
50249f417f60: Layer already exists 
308817e4fc18: Layer already exists 
159f14b224e2: Layer already exists 
d4a2fce0f4ab: Layer already exists 
5be6a5d3fc93: Pushed 
e611347a452f: Pushed 
5f70bf18a086: Pushed 
2f9e60689d2b: Pushed 
70df77fd1c09: Pushed 
4db72d16bb63: Pushed 
d7082a8129ea: Pushed 
6615b78892ea: Pushed 
64042e60a2a6: Pushed 
62329031ba4e: Pushed 
86426b9e591d: Pushed 
latest: digest: sha256:f2905050e3ac1821d6f6753dd4a649aa7db03f2da5425f056033aeaf3e7cc809 size: 3665

@dsavineau
Copy link
Contributor

This is somehow related to what I asked in #52 (comment) since the snippets aren't included anymore dynamically.

@rooftopcellist @aknochow Do you have any preference on this ?

@rooftopcellist
Copy link
Member

@dsavineau @kurokobo I think this is probably best for now, unless we can figure out a good way to include the web snippets.. Unfortunately, the snippets live in the galaxy_ng container iirc. We would need to get some changes into the ansible-hub-ui repo.

So it becomes a question of whether we want to vendor an extra copy in the galaxy-operator repo, or the ansible-hub-ui repo... unless the UI folks clone the galaxy_ng repo for all image builds.

My vote is to merge this as is for now.

@rooftopcellist rooftopcellist self-requested a review March 4, 2024 21:26
@rooftopcellist
Copy link
Member

@dsavineau and I talked it over a bit more and agree that we should add all of the needed snippets to this nginx configmap. We may add a GHA check that runs nightly to see if a diff in introduced between the base repos that contain these snippets, and the galaxy-operator's copy.

It looks like we still need to include these though:

@rooftopcellist rooftopcellist merged commit 020b009 into ansible:main Mar 4, 2024
5 checks passed
@kurokobo kurokobo deleted the nginx_v2 branch March 4, 2024 23:47
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.

Pushing EE images failed due to missing nginx conf for pulp_container
3 participants