replace ant tasks kubectl usage by uyunictl #7505

rjpmestre · 2023-09-06T11:34:07Z

What does this PR change?

replace ant tasks kubectl usage by uyunictl

GUI diff

No difference.

DONE

Documentation

No documentation needed: only internal and user invisible changes
DONE

Test coverage

No tests
DONE

Links

Fixes #
None

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"

In the container world the hostname is private to the cluster and could even contain random parts. This change avoids confusion between the FQDN and HOST variables and offers a clean code path for containers.

When running the setup in a container running on kubernetes we don't have control on the hostname the user knows about. Rather that relying on getting it from the system, allow reading it from the setup input file.

When running the setup in a container we want to avoid the setup_env.sh script and read the values from variables.

Running mgr-bootstrap in a containerized server cannot assume the hostname is the user-facing FQDN.

Provide a helm chart to ease installation of the server container on kubernetes cluster.

…positories (uyuni-project#7352)

….sh (uyuni-project#7504)

cbosdo

I probably provided different instructions in the beginning, the PR looks good, but I would remove the podman specific parts as mentioned in the comments

cbosdo · 2023-09-07T06:22:52Z

java/manager-build.xml

@@ -17,6 +17,10 @@
  <property file="conf/rhn_java.conf"/>

  <!-- Other properties -->
+  <property name="container.name" value="uyuni-server" />


You can remove the container.name property: this is automatically discovered by uyunictl

cbosdo · 2023-09-07T06:25:14Z

java/manager-build.xml

@@ -17,6 +17,10 @@
  <property file="conf/rhn_java.conf"/>

  <!-- Other properties -->
+  <property name="container.name" value="uyuni-server" />
+  <property name="ssh.key" value="/home/user/.ssh/id_rsa" />
+  <property name="podman.connection.name" value="srv" />


I would let the user configure their connections at the podman level and only pass the connection name to the ant target. What do you guys think about it? In any case for kubernetes users they would need to setup they kubeconfig file to connect to the cluster.

cbosdo · 2023-09-07T06:26:06Z

java/manager-build.xml

+    </fail>
+  </target>
+
+  <target name="is-podman-installed" description="Cheks if podman is installed">


We don't care if podman or kubectl is installed: uyunictl checks for us, and even checks for podman-remote.

cbosdo · 2023-09-07T06:28:40Z

java/manager-build.xml

+  <target name="remove-podman-connection" depends="warn-if-podman-not-installed" description="Removes podman system connection">
+    <echo message="Removing podman system connection..."/>
+    <exec executable="podman">
+      <arg line="system connection rm ${podman.connection.name}"/>


I probably mislead you here, but the more I think about it, the more I'm convinced we don't want any podman or kubectl specific code here. We can just document how to setup the connections. Setting up a remote connection on podman doesn't prevent from using the local podman instance if the user doesn't set the CONTAINER_CONNECTION variable or the --connection parameter.

cbosdo · 2023-09-07T06:29:51Z

java/manager-build.xml

    <exec failonerror="true" executable="sh">
-        <arg line="-c 'tar c -p -C ${frontend.dist.dir} -f - . | kubectl exec -i ${kubectl.args} -- tar xf - -C /srv/www/htdocs'"/>
+      <arg line="-c 'tar c -C ${build.dir}/webapp -f - --exclude=log4j2.xml . | uyunictl exec -i -- tar xf - -C ${deploy.dir}'"/>


I don't remember why I had to use tar here, but it seems that kubectl can copy folders too. In any case this should be handled at the uyunictl level, not the ant file to make uyunictl user's life easier. Is there any reason not to use your fancy copy-to-container macro?

As we agreed, on this specific case we're sticking to the tar solution. The reason is that kubectl doesn't support excluding specific files/folder during the copy operation.

cbosdo · 2023-09-07T06:31:49Z

java/manager-build.xml

-    <exec executable="kubectl">
-        <arg line="exec ${kubectl.args} -- sed 's/JAVA_OPTS=&quot;\([^&quot;]*\)&quot;/JAVA_OPTS=&quot;-Xdebug -Xrunjdwp:transport=dt_socket,address=\$HOSTNAME:8000,server=y,suspend=n \1&quot;/' -i /etc/sysconfig/tomcat"/>
+  <!-- wraps uyunictl command, executing the given argline and setting the CONTAINER_CONNECTION env var -->
+  <macrodef name="wrap-uyunictl">


I love the way you implemented this with a macro 😍 . May be you can name it simply uyunictl

cbosdo · 2023-09-07T06:33:01Z

java/manager-build.xml

+    <sequential>
+      <exec failonerror="@{failonerror}" executable="uyunictl">
+        <arg line="@{argline}"/>
+        <env key="CONTAINER_CONNECTION" value="${podman.connection.name}"/>


This variable is not useful in the case of kubectl but can't harm if it's added unconditionnaly

cbosdo · 2023-09-07T06:33:33Z

java/manager-build.xml

+    <attribute name="failonerror" default="false"/>
+    <sequential>
+      <exec failonerror="@{failonerror}" executable="sh">
+        <arg line="-c 'tar c -p -C @{source} -f - . | uyunictl exec -i -- tar xf - -C @{target}'"/>


Probably we can get rid of the tar part here.

rjpmestre · 2023-09-07T15:00:57Z

I probably provided different instructions in the beginning, the PR looks good, but I would remove the podman specific parts as mentioned in the comments

yes, i forced this to use podman remote connection every where. Pretty much all tasks were updated and podman references should be gone

cbosdo

Now you just need to rebase and merge! Thanks for the PR

cbosdo and others added 20 commits September 4, 2023 15:58

Reportdb setup: only use fqdn when nothing provided in --host

a8f0180

In the container world the hostname is private to the cluster and could even contain random parts. This change avoids confusion between the FQDN and HOST variables and offers a clean code path for containers.

mgr-setup: read hostname from input file

16edc3e

When running the setup in a container running on kubernetes we don't have control on the hostname the user knows about. Rather that relying on getting it from the system, allow reading it from the setup input file.

Setup cobbler with provided FQDN rather than from system discovery

386f5ee

Use environment variables in mgr-setup if available

64762e1

When running the setup in a container we want to avoid the setup_env.sh script and read the values from variables.

mgr-bootstrap read the hostname from rhn.conf if possible

3d74fd9

Running mgr-bootstrap in a containerized server cannot assume the hostname is the user-facing FQDN.

initial version uyuni server image

2789395

Add ant rules to deploy to a kubernetes pod

8c844c4

Add notes on how to use the server container image

8817109

Use a MIRROR_PATH environment variable at setup for containers

c94020f

Add helm chart for the server container

011a0ba

Provide a helm chart to ease installation of the server container on kubernetes cluster.

Adjust testsuite for containerized server

8d694a8

testsuite: increase waiting AJAX transition

a8b5056

testsuite ipmi fixes

b2a1d11

Use CA certificate from /etc/pki/trust/anchors in rhnpush

04d37f8

Initial Hub XML-RPC API container image

1089dc2

timezone service

f3dd81b

move /srv/www/htdoc/pub/repositories to /usr/share/susemanager/gpg/re…

14455d6

…positories (uyuni-project#7352)

remove client_config_update

664fb93

setup postfix hostname using conf file

19608b5

replace ant tasks kubectl usage by uyunictl

b7a1a53

rjpmestre requested a review from a team as a code owner September 6, 2023 11:34

rjpmestre requested review from mackdk and removed request for a team September 6, 2023 11:34

github-actions bot added java java_lint_checkstyle java_pgsql_tests labels Sep 6, 2023

rjpmestre requested review from cbosdo, mbussolotto and a team and removed request for mackdk September 6, 2023 11:34

set BuildTag for Dockerfile and Chart.yaml using push-packages-to-obs…

a07128c

….sh (uyuni-project#7504)

cbosdo reviewed Sep 7, 2023

View reviewed changes

rjpmestre added 3 commits September 7, 2023 15:45

Merge branch 'uyuni-project:server-container' into server-container

3b184a1

remove podman specific references and wrapper

7780697

fix properties

7cf9ab2

mbussolotto force-pushed the server-container branch from a07128c to a1bdad9 Compare September 8, 2023 07:53

mbussolotto requested review from a team as code owners September 8, 2023 07:53

mbussolotto requested review from meaksh and removed request for a team September 8, 2023 07:53

rjpmestre requested a review from cbosdo September 8, 2023 10:14

rjpmestre self-assigned this Sep 8, 2023

Merge branch 'server-container' into server-container

0c0a2e3

cbosdo approved these changes Sep 8, 2023

View reviewed changes

rjpmestre merged commit fb89dc8 into uyuni-project:server-container Sep 8, 2023
10 of 12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

replace ant tasks kubectl usage by uyunictl #7505

replace ant tasks kubectl usage by uyunictl #7505

rjpmestre commented Sep 6, 2023 •

edited

Loading

cbosdo left a comment

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

rjpmestre Sep 7, 2023

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

cbosdo Sep 7, 2023

rjpmestre commented Sep 7, 2023

cbosdo left a comment

replace ant tasks kubectl usage by uyunictl #7505

replace ant tasks kubectl usage by uyunictl #7505

Conversation

rjpmestre commented Sep 6, 2023 • edited Loading

What does this PR change?

GUI diff

Documentation

Test coverage

Links

Changelogs

Re-run a test

cbosdo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjpmestre commented Sep 7, 2023

cbosdo left a comment

Choose a reason for hiding this comment

rjpmestre commented Sep 6, 2023 •

edited

Loading