Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions cmd/manageDeploymentRepo.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ import (
)

const (
FlagGitConfig = "git-config"
FlagOcmConfig = "ocm-config"
FlagKubeConfig = "kubeconfig"
FlagGitConfig = "git-config"
FlagOcmConfig = "ocm-config"
FlagKubeConfig = "kubeconfig"
FlagExtraManifestDir = "extra-manifest-dir"
)

type LogWriter struct{}
Expand Down Expand Up @@ -69,6 +70,7 @@ openmcp-bootstrapper manageDeploymentRepo <configFile>`,
targetCluster,
cmd.Flag(FlagGitConfig).Value.String(),
cmd.Flag(FlagOcmConfig).Value.String(),
cmd.Flag(FlagExtraManifestDir).Value.String(),
).Initialize(cmd.Context())

defer func() {
Expand All @@ -94,6 +96,11 @@ openmcp-bootstrapper manageDeploymentRepo <configFile>`,
return fmt.Errorf("failed to apply custom resource definitions: %w", err)
}

err = deploymentRepoManager.ApplyExtraManifests(cmd.Context())
if err != nil {
return fmt.Errorf("failed to apply extra manifests: %w", err)
}

err = deploymentRepoManager.UpdateResourcesKustomization()
if err != nil {
return fmt.Errorf("failed to update resources kustomization: %w", err)
Expand All @@ -119,6 +126,7 @@ func init() {
manageDeploymentRepoCmd.Flags().String(FlagOcmConfig, "", "ocm configuration file")
manageDeploymentRepoCmd.Flags().String(FlagGitConfig, "", "Git configuration file")
manageDeploymentRepoCmd.Flags().String(FlagKubeConfig, "", "Kubernetes configuration file")
manageDeploymentRepoCmd.Flags().String(FlagExtraManifestDir, "", "Directory containing extra manifests to apply")

if err := manageDeploymentRepoCmd.MarkFlagRequired(FlagGitConfig); err != nil {
panic(err)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/spf13/cobra v1.10.1
github.com/stretchr/testify v1.11.1
k8s.io/api v0.34.0
k8s.io/apimachinery v0.34.1
k8s.io/apimachinery v0.34.0
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
sigs.k8s.io/controller-runtime v0.22.1
sigs.k8s.io/kustomize/api v0.20.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
Expand Down
Loading