Improved Hub XML-RPC support #357
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
nadvornik
force-pushed
the
hub-xmlrpc2
branch
3 times, most recently
from
6aeba80 to
8dbb800
Compare
cbosdo
reviewed
Jun 12, 2024
cbosdo
reviewed
Jun 24, 2024
Comment on lines
28
to
30
| dummyMigration := types.ImageFlags{} | ||
| dummyCoco := types.ImageFlags{} | ||
| dummyHubXmlrpc := types.ImageFlags{} |
There was a problem hiding this comment.
Instead of having a variable for each flags, could we just have an emptyImageFlags and use it for all parameters?
mgradm/shared/kubernetes/install.go
Outdated
Comment on lines
28
to
31
| tag := hubXmlrpcFlags.Tag | ||
| if tag == "" { | ||
| tag = imageFlags.Tag | ||
| } |
There was a problem hiding this comment.
I'll need to make sure I have this logic wired in the new implementation of ComputeImage I'm working on
shared/kubernetes/utils.go
Outdated
| @@ -373,3 +373,15 @@ func GenerateOverrideDeployment(deployData types.Deployment) (string, error) { | |||
| } | |||
| return string(ret), nil | |||
| } | |||
|
|
|||
| // GetRunningImage returns the image running in the current system. | |||
There was a problem hiding this comment.
Suggested change
| // GetRunningImage returns the image running in the current system. | |
| // GetRunningImage returns the image of containerName for the server running in the current system. |
| @@ -0,0 +1 @@ | |||
| - Improved Hub XML-RPC support | |||
There was a problem hiding this comment.
Suggested change
| - Improved Hub XML-RPC support | |
| - Handle Hub XML-RPC in migration and kubernetes. |
This was referenced Jul 16, 2024
cbosdo
reviewed
Jul 22, 2024
| @@ -40,10 +41,11 @@ func Deploy( | |||
| isK3s := clusterInfos.IsK3s() | |||
| IsRke2 := clusterInfos.IsRke2() | |||
| if !prepare { | |||
| tcpPorts, udpPorts := GetPortLists(hubXmlrpcFlags.Replicas > 0, debug) | |||
There was a problem hiding this comment.
I wonder if we want to setup traefik / nginx with hub ports in all cases or not. The problem is that if the user decides to scale the number of replicas of the hub API, then traefik / nginx config is not ready.
cbosdo
reviewed
Jul 22, 2024
| cnx := shared.NewConnection("kubectl", "", kubernetes.ServerFilter) | ||
|
|
||
| origHubXmlrpcImage, err := kubernetes.GetRunningImage("hub-xmlrpc-api") |
There was a problem hiding this comment.
This would work for Hub XML-RPC API since we can have at most 1 replica, but I would see a Connection.GetReplicasCount("hub-xmlrpc-api"). This could also be reused for CoCo containers in the future.
cbosdo
force-pushed
the
hub-xmlrpc2
branch
2 times, most recently
from
f482336 to
1cdbbad
Compare
cbosdo
force-pushed
the
hub-xmlrpc2
branch
3 times, most recently
from
e31c74a to
c80db2b
Compare
cbosdo
force-pushed
the
hub-xmlrpc2
branch
3 times, most recently
from
65a363c to
8962969
Compare
cbosdo
force-pushed
the
hub-xmlrpc2
branch
3 times, most recently
from
4f40e7c to
38864fb
Compare
cbosdo
force-pushed
the
hub-xmlrpc2
branch
3 times, most recently
from
33d84b8 to
0a8ee8d
Compare
During a migration to kubernetes the server is deployed after the rsync to prepare the SSL secrets and PVC. This has the nasty effect to corrupt the synchronized data with a too recent catalog version ID. This would let the DB migration to fail starting the old postgresql server. To workaround this, move the data to the the backup place after the rsync instead of the begining of the db upgrade.
After the k8s migration the pod has been started again since the initial connection creation. We need to reset the connection to not search for the old pod name.
Some pods require a long time to run. This is the case for the DB upgrade finalization that runs a potentially long reindex.
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.
What does this PR change?
This PR adds Hub XML-RPC support to podman migrate and upgrade and to all kubernetes commands.
Also, it fixes some kubernetes problems:
This PR depends on uyuni-project/uyuni#8902
Test coverage
No tests: add explanation
No tests: already covered
Unit tests were added
DONE
Links
Issue(s): #292
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:
If you uncheck the checkbox after the PR is created, you will need to re-run
changelog_test(see below)Before you merge
Check How to branch and merge properly!