Skip to content

Commit 0f5da48

Browse files
renovate[bot]reshnm
authored andcommitted
chore: enable tests for manageDeploymentRepo command
1 parent f3006a6 commit 0f5da48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+31297
-175
lines changed

cmd/manageDeploymentRepo.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import (
1717
)
1818

1919
const (
20-
FlagGitConfig = "git-config"
21-
FlagOcmConfig = "ocm-config"
22-
FlagKubeConfig = "kubeconfig"
20+
FlagGitConfig = "git-config"
21+
FlagOcmConfig = "ocm-config"
22+
FlagKubeConfig = "kubeconfig"
23+
FlagExtraManifestDir = "extra-manifest-dir"
2324
)
2425

2526
type LogWriter struct{}
@@ -69,6 +70,7 @@ openmcp-bootstrapper manageDeploymentRepo <configFile>`,
6970
targetCluster,
7071
cmd.Flag(FlagGitConfig).Value.String(),
7172
cmd.Flag(FlagOcmConfig).Value.String(),
73+
cmd.Flag(FlagExtraManifestDir).Value.String(),
7274
).Initialize(cmd.Context())
7375

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

99+
err = deploymentRepoManager.ApplyExtraManifests(cmd.Context())
100+
if err != nil {
101+
return fmt.Errorf("failed to apply extra manifests: %w", err)
102+
}
103+
97104
err = deploymentRepoManager.UpdateResourcesKustomization()
98105
if err != nil {
99106
return fmt.Errorf("failed to update resources kustomization: %w", err)
@@ -119,6 +126,7 @@ func init() {
119126
manageDeploymentRepoCmd.Flags().String(FlagOcmConfig, "", "ocm configuration file")
120127
manageDeploymentRepoCmd.Flags().String(FlagGitConfig, "", "Git configuration file")
121128
manageDeploymentRepoCmd.Flags().String(FlagKubeConfig, "", "Kubernetes configuration file")
129+
manageDeploymentRepoCmd.Flags().String(FlagExtraManifestDir, "", "Directory containing extra manifests to apply")
122130

123131
if err := manageDeploymentRepoCmd.MarkFlagRequired(FlagGitConfig); err != nil {
124132
panic(err)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/spf13/cobra v1.10.1
1515
github.com/stretchr/testify v1.11.1
1616
k8s.io/api v0.34.0
17-
k8s.io/apimachinery v0.34.1
17+
k8s.io/apimachinery v0.34.0
1818
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
1919
sigs.k8s.io/controller-runtime v0.22.1
2020
sigs.k8s.io/kustomize/api v0.20.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
278278
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
279279
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
280280
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
281-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
282-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
281+
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
282+
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
283283
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
284284
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
285285
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)