Skip to content

Clean up Fabric8 migration leftovers - #620

Merged
avetgit merged 10 commits into
developfrom
feature/fabric8-cleanup
Sep 30, 2026
Merged

avetgit merged 10 commits into
developfrom
feature/fabric8-cleanup

Conversation

@avetgit

@avetgit avetgit commented Sep 29, 2026

Copy link
Copy Markdown
Contributor

Summary

Complete the remaining cleanup after migrating Kubernetes operations from kubectl to the Fabric8 Kubernetes Client.

The changes remove leftover kubectl-specific semantics, dead Kubernetes client APIs and incomplete tests while keeping the existing GOP behavior.

Changes

  • Remove obsolete kubectl-related shell helpers from the runtime path
  • Replace kubectl-specific node and label handling with explicit Fabric8 operations
  • Remove unused service NodePort patching
  • Remove kubectl-style label removal semantics
  • Replace the kubectl-like run() API and CLI flags with an explicit temporary pod operation
  • Build the Jenkins Docker GID lookup pod with Fabric8 PodBuilder
  • Remove untyped pod override handling
  • Remove unused K8sClient convenience overloads
  • Add the missing assertion for Monitoring mail secret creation
  • Stabilize the Monitoring integration test by waiting for Prometheus instead of checking a fixed pod count
  • Re-enable ContentLoader image pull secret tests and isolate them from a real Kubernetes API

Verification

  • Relevant unit tests pass
  • Monitoring integration test passes
  • GOP deployment including Jenkins succeeds
  • Jenkins node labeling and Docker GID lookup work as expected
  • Full GOP rollout succeeds after the changes

Remaining kubectl usages are limited to documentation, local/development tooling and user-facing helper commands and are not runtime dependencies of the GOP.

@yannickchristhomas yannickchristhomas left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot review overview

🟢 Approval recommended

The cleanup is internally consistent, preserves the intended behavior, and includes focused test updates.

Review effort: Balanced
Findings: None

What changed in this PR

Completes the Fabric8 Kubernetes Client migration by removing obsolete kubectl-oriented APIs and updating runtime operations and tests.

Changes:

  • Replaces generic kubectl-style pod and label operations with typed Fabric8 APIs.
  • Removes unused Kubernetes helpers and shell dependencies.
  • Re-enables and strengthens monitoring, Jenkins, and image-pull-secret tests.
File Description
.dockerignore Removes the deleted utility script from the allowlist.
scripts/​get-remote-url Inlines the remaining kubectl helper.
scripts/​jenkins/​init-jenkins.sh Removes obsolete utility sourcing and hostname setup.
scripts/​utils.sh Deletes unused kubectl shell helpers.
src/​main/​java/​com/​cloudogu/​gitops/​infrastructure/​kubernetes/​api/​K8sClient.java Simplifies APIs and adds typed temporary-pod execution and node-label removal.
src/​main/​java/​com/​cloudogu/​gitops/​infrastructure/​kubernetes/​api/​K8sClientHelper.java Removes kubectl compatibility logic and streamlines temporary-pod cleanup.
src/​main/​java/​com/​cloudogu/​gitops/​tools/​core/​Jenkins.java Uses Fabric8 pod construction and explicit node labeling.
src/​test/​java/​com/​cloudogu/​gitops/​application/​content/​ContentLoaderTest.java Re-enables isolated image-pull-secret tests.
src/​test/​java/​com/​cloudogu/​gitops/​infrastructure/​kubernetes/​api/​K8sClientTest.java Updates coverage for the revised Kubernetes APIs.
src/​test/​java/​com/​cloudogu/​gitops/​integration/​tools/​MonitoringTestIT.java Waits for the Prometheus pod instead of asserting a fixed pod count.
src/​test/​java/​com/​cloudogu/​gitops/​tools/​MonitoringTest.java Verifies Grafana mail-secret creation.
src/​test/​java/​com/​cloudogu/​gitops/​tools/​core/​JenkinsTest.java Verifies the typed temporary pod and node-label operations.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@avetgit
avetgit merged commit a8b672b into develop Sep 30, 2026
3 checks passed
@avetgit
avetgit deleted the feature/fabric8-cleanup branch September 30, 2026 11:54
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.

3 participants