include /etc/squid/conf.d/*.conf #8779

mbussolotto · 2024-05-17T16:00:21Z

What does this PR change?

include /etc/squid/conf.d/*.conf

GUI diff

No difference.

DONE

Documentation

uyuni-project/uyuni-docs#3011

DONE

Test coverage

No tests
DONE

Links

Issue(s): uyuni-project/uyuni-tools#263
Depends on: uyuni-project/uyuni-tools#320

DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

Re-run test "changelog_test"
Re-run test "backend_unittests_pgsql"
Re-run test "java_pgsql_tests"
Re-run test "schema_migration_test_pgsql"
Re-run test "susemanager_unittests"
Re-run test "javascript_lint"
Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

rjmateus · 2024-05-20T18:13:15Z

containers/proxy-squid-image/Dockerfile

@@ -30,6 +30,9 @@ COPY squid.conf /etc/squid/squid.conf
 RUN chown squid:squid /etc/squid/squid.conf
 RUN mkdir -p /run/squid && chown squid:squid /run/squid

+RUN mkdir -p /etc/squid/conf.d
+COPY squid_image.conf /etc/squid/conf.d/squid_image.conf


the folder needs to have at least one file. This is why you are including this empty file?

agraul

LGTM, please make sure that you rebase #8773 after merging this PR (or merge the other PR first and rebase this one)

mbussolotto · 2024-05-22T09:44:20Z

@cbosdo podman is fine. I tested K3s running:

./mgrpxy install kubernetes config.tar.gz  --helm-proxy-chart oci://registry.opensuse.org/home/mbussolotto/branches/systemsmanagement/uyuni/master/charts/uyuni/proxy-helm --tuningSquid s_t.conf --tuningHttpd a_t.conf --logLevel=debug

where

uyuniproxyk3s:~ # cat s_t.conf
#MY SQUID CONF
uyuniproxyk3s:~ # cat a_t.conf
#MY APACHE CONF

The pod are running correctly and I have:

uyuniproxyk3s:~ # kubectl get configmap -o yaml
....
- apiVersion: v1
  data:
    apache_tuning: |
      # Add your Apache tuning configuration here
      #MY APACHE CONF
    config.yaml: |
...
    squid_tuning: |
      # Add your Squid tuning configuration here
      #MY SQUID CONF
  kind: ConfigMap
  metadata:
    annotations:
      meta.helm.sh/release-name: uyuni-proxy
      meta.helm.sh/release-namespace: default
    creationTimestamp: "2024-05-22T09:38:22Z"
    labels:
      app.kubernetes.io/managed-by: Helm
    name: proxy-configmap
    namespace: default
...

is it enough as kubernetes test?

cbosdo

LGTM, maybe the empty squid file could be more useful

containers/proxy-squid-image/squid_image.conf

containers/proxy-squid-image/uyuni-configure.py

github-actions · 2024-05-22T13:05:47Z

👋 Hello! Thanks for contributing to our project.
Acceptance tests will take some time (aprox. 1h), please be patient ☕
You can see the progress at the end of this page and at https://github.com/uyuni-project/uyuni/pull/8779/checks
Once tests finish, if they fail, you can check 👀 the cucumber report. See the link at the output of the action.
You can also check the artifacts section, which contains the logs at https://github.com/uyuni-project/uyuni/pull/8779/checks.

If you are unsure the failing tests are related to your code, you can check the "reference jobs". These are jobs that run on a scheduled time with code from master. If they fail for the same reason as your build, it means the tests or the infrastructure are broken. If they do not fail, but yours do, it means it is related to your code.

Reference tests:

KNOWN ISSUES

Sometimes the build can fail when pulling new jar files from download.opensuse.org . This is a known limitation. Given this happens rarely, when it does, all you need to do is rerun the test. Sorry for the inconvenience.

For more tips on troubleshooting, see the troubleshooting guide.

Happy hacking!
⚠️ You should not merge if acceptance tests fail to pass. ⚠️

github-actions · 2024-05-22T13:05:59Z

Suggested tests to cover this Pull Request

sle_ssh_minion
min_salt_migration
min_salt_install_with_staging
proxy_register_as_minion_with_script
min_deblike_salt
allcli_overview_systems_details
min_salt_formulas
min_project_lotus
srv_docker_cve_audit
minssh_move_from_and_to_proxy
min_salt_install_package
min_deblike_remote_command
srv_monitoring
srv_datepicker
min_salt_openscap_audit
minkvm_guests
min_monitoring
min_recurring_action
min_salt_minion_details
srv_restart
min_rhlike_openscap_audit
srv_distro_cobbler
srv_custom_system_info
min_salt_minions_page
min_deblike_salt_install_package
min_empty_system_profiles
min_cve_id_new_syntax
min_ssh_tunnel
allcli_sanity
min_move_from_and_to_proxy
min_ansible_control_node
srv_power_management_redfish
min_bootstrap_script
min_rhlike_monitoring
srv_menu
allcli_software_channels_dependencies
min_cve_audit
min_salt_mgrcompat_state
min_config_state_channel
srv_reportdb
buildhost_bootstrap
minssh_salt_install_package
allcli_reboot
minssh_bootstrap_api
proxy_retail_pxeboot_and_mass_import
min_rhlike_salt_install_package_and_patch
min_deblike_monitoring
min_deblike_salt_install_with_staging
min_check_patches_install
srv_user_configuration_salt_states
srv_scc_user_credentials
srv_cobbler_distro
min_rhlike_salt
min_salt_lock_packages
srv_rename_hostname
proxy_branch_network
min_bootstrap_api
srv_group_union_intersection
minssh_ansible_control_node
srv_virtual_host_manager
allcli_action_chain
min_salt_formulas_advanced
min_config_state_channel_api
srv_cobbler_profile
srv_power_management
min_salt_user_states
allcli_config_channel
min_virthost
min_deblike_openscap_audit
srv_power_management_api
min_action_chain
min_config_state_channel_subscriptions
buildhost_docker_auth_registry
min_timezone
min_bootstrap_negative
buildhost_osimage_build_image
srv_manage_activationkey
srv_advanced_search
min_activationkey
allcli_software_channels
min_bootstrap_reactivation
min_rhlike_remote_command
srv_maintenance_windows
min_salt_pkgset_beacon
proxy_as_pod_basic_tests
buildhost_docker_build_image
sle_minion
min_deblike_ssh
min_salt_software_states
min_rhlike_ssh
minssh_action_chain
min_custom_pkg_download_endpoint
allcli_system_group
proxy_cobbler_pxeboot
srv_manage_channels_page
min_bootstrap_ssh_key
min_retracted_patches
min_change_software_channel

rjmateus · 2024-05-22T16:07:21Z

containers/proxy-squid-image/uyuni-configure.py

+        file_content = re.sub(
+            r"access_log .*", "access_log stdio:/proc/self/fd/1 squid", file_content
+        )
+        file_content += "\n" + "include /etc/squid/conf.d/*" + "\n"


if we are always adding this line, why not to add it to the squid configuration directly?

It has sense, but I guess the same is valid also for access_log param, am I right ?
cc @cbosdo

The access_log would mess up the non-container install, so it has to stay here until we completely remove this installation method for Uyuni.

right, so the same is valid also for this include. I'll keep the change here

cbosdo

I still see Marek's changes for the linting. I suppose those are merged in master, you probably need to rebase on master. Everything else LGTM

admd · 2024-05-23T16:08:30Z

@mbussolotto please rebase now as other PR has been merged!

include /etc/squid/conf.d/*.conf

mbussolotto force-pushed the squid_conf branch 3 times, most recently from fb3c3c5 to 463eebd Compare May 20, 2024 10:04

rjmateus reviewed May 20, 2024

View reviewed changes

mbussolotto force-pushed the squid_conf branch 2 times, most recently from 4b7f134 to e701c1a Compare May 21, 2024 13:31

mbussolotto marked this pull request as ready for review May 21, 2024 14:07

mbussolotto requested a review from a team as a code owner May 21, 2024 14:07

mbussolotto requested review from agraul and cbosdo and removed request for a team May 21, 2024 14:07

agraul approved these changes May 22, 2024

View reviewed changes

cbosdo reviewed May 22, 2024

View reviewed changes

containers/proxy-squid-image/squid_image.conf Outdated Show resolved Hide resolved

mbussolotto force-pushed the squid_conf branch from 741a9ba to d0f4d8b Compare May 22, 2024 12:48

mbussolotto commented May 22, 2024

View reviewed changes

containers/proxy-squid-image/uyuni-configure.py Show resolved Hide resolved

mbussolotto requested a review from cbosdo May 22, 2024 12:50

mbussolotto force-pushed the squid_conf branch 2 times, most recently from 9c9141a to 07d4feb Compare May 22, 2024 13:05

mbussolotto requested review from a team as code owners May 22, 2024 13:05

github-actions bot added java java_lint_checkstyle java_pgsql_tests API schema_migration_test_pgsql labels May 22, 2024

github-actions bot added database schema_migration_test_oracle labels May 22, 2024

github-actions bot added ui javascript_lint testing ruby_rubocop data-model old-ui webui-templates labels May 22, 2024

github-actions bot added the needs-translation label May 22, 2024

mbussolotto force-pushed the squid_conf branch from 07d4feb to 2a5a418 Compare May 22, 2024 13:09

Etheryte removed the request for review from a team May 22, 2024 13:58

This was referenced May 22, 2024

Fixes in the Admin Guide / SSL certs uyuni-project/uyuni-docs#3011

Closed

allow to add configuration file for apache and squid uyuni-project/uyuni-tools#320

Merged

rjmateus reviewed May 22, 2024

View reviewed changes

cbosdo approved these changes May 23, 2024

View reviewed changes

mbussolotto force-pushed the squid_conf branch from 2a5a418 to 9d59b18 Compare May 23, 2024 14:54

mbussolotto added 3 commits May 23, 2024 18:10

include /etc/squid/conf.d/*.conf

8044bff

include /etc/squid/conf.d/*.conf

squid and apache conf in k8s

4eed601

changelog

ed06b7c

mbussolotto force-pushed the squid_conf branch from 9d59b18 to ed06b7c Compare May 23, 2024 16:11

rjmateus approved these changes May 23, 2024

View reviewed changes

admd merged commit cbf0896 into uyuni-project:master May 23, 2024
19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

include /etc/squid/conf.d/*.conf #8779

include /etc/squid/conf.d/*.conf #8779

mbussolotto commented May 17, 2024 •

edited

Loading

rjmateus May 20, 2024

agraul left a comment

mbussolotto commented May 22, 2024

cbosdo left a comment

github-actions bot commented May 22, 2024

github-actions bot commented May 22, 2024

rjmateus May 22, 2024

mbussolotto May 23, 2024

cbosdo May 23, 2024

mbussolotto May 23, 2024

cbosdo left a comment

admd commented May 23, 2024

include /etc/squid/conf.d/*.conf #8779

include /etc/squid/conf.d/*.conf #8779

Conversation

mbussolotto commented May 17, 2024 • edited Loading

What does this PR change?

GUI diff

Documentation

Test coverage

Links

Changelogs

Re-run a test

Before you merge

rjmateus May 20, 2024

Choose a reason for hiding this comment

agraul left a comment

Choose a reason for hiding this comment

mbussolotto commented May 22, 2024

cbosdo left a comment

Choose a reason for hiding this comment

github-actions bot commented May 22, 2024

github-actions bot commented May 22, 2024

rjmateus May 22, 2024

Choose a reason for hiding this comment

mbussolotto May 23, 2024

Choose a reason for hiding this comment

cbosdo May 23, 2024

Choose a reason for hiding this comment

mbussolotto May 23, 2024

Choose a reason for hiding this comment

cbosdo left a comment

Choose a reason for hiding this comment

admd commented May 23, 2024

mbussolotto commented May 17, 2024 •

edited

Loading