Skip to content

Commit 1a7339b

Browse files
Tomasz-Smelcerz-SAPTomasz-Smelcerz-SAP
committed
Rebase fix
1 parent 5ac7c15 commit 1a7339b

File tree

4 files changed

+81
-88
lines changed

4 files changed

+81
-88
lines changed

‎tests/integration/controller/kcp/helper_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
//"time"
87

98
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
109
apimetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎tests/integration/controller/kcp/remote_sync_test.go‎

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package kcp_test
22

33
import (
4+
"context"
5+
"encoding/json"
46
"errors"
57
"fmt"
68
"maps"
@@ -108,7 +110,20 @@ var _ = Describe("Kyma sync into Remote Cluster", Ordered, func() {
108110
Should(Succeed())
109111
})
110112

113+
It("ModuleReleaseMeta should be created in KCP", func() {
114+
registerDescriptor(moduleInSKROCMName, moduleVersion)
115+
Eventually(configureKCPModuleReleaseMeta, Timeout, Interval).WithArguments(moduleInSKR.Name).Should(Succeed())
116+
registerDescriptor(moduleInKCPOCMName, moduleVersion)
117+
Eventually(configureKCPModuleReleaseMeta, Timeout, Interval).WithArguments(moduleInKCP.Name).Should(Succeed())
118+
})
119+
111120
It("ModuleTemplates should be synchronized in both clusters", func() {
121+
//time.Sleep(15 * time.Second)
122+
//PrintKymas(ctx, kcpClient)
123+
//PrintModuleTemplates(ctx, kcpClient)
124+
//PrintModuleReleaseMetas(ctx, kcpClient)
125+
//PrintManifests(ctx, kcpClient)
126+
112127
By("ModuleTemplate exists in KCP cluster")
113128
Eventually(ModuleTemplateExists, Timeout, Interval).
114129
WithArguments(ctx, kcpClient, moduleInKCP, kyma).
@@ -150,12 +165,6 @@ var _ = Describe("Kyma sync into Remote Cluster", Ordered, func() {
150165
Should(Succeed())
151166
})
152167

153-
It("ModuleReleaseMeta should be created in KCP", func() {
154-
registerDescriptor(moduleInSKROCMName, moduleVersion)
155-
Eventually(configureKCPModuleReleaseMeta, Timeout, Interval).WithArguments(moduleInSKR.Name).Should(Succeed())
156-
registerDescriptor(moduleInKCPOCMName, moduleVersion)
157-
Eventually(configureKCPModuleReleaseMeta, Timeout, Interval).WithArguments(moduleInKCP.Name).Should(Succeed())
158-
})
159168

160169
It("Enable module in SKR Kyma CR", func() {
161170
By("add module to remote Kyma")
@@ -585,3 +594,69 @@ func assertCrdGenerationAnnotations(kcpKyma *v1beta2.Kyma, annotationName string
585594
}
586595
return nil
587596
}
597+
598+
func PrintModuleTemplates(ctx context.Context, clnt client.Client) {
599+
fmt.Printf("\n#### ModuleTemplates: ##########################################################\n")
600+
moduletemplates := v1beta2.ModuleTemplateList{}
601+
if err := clnt.List(ctx, &moduletemplates); err != nil {
602+
fmt.Printf("%s", fmt.Errorf("while listing ModuleTemplates: %w", err))
603+
}
604+
for i, mtemplate := range moduletemplates.Items {
605+
fmt.Printf("ModuleTemplate %d: name: %s, spec.moduleName: %q, spec.version: %q\n",
606+
i, mtemplate.Name, mtemplate.Spec.ModuleName, mtemplate.Spec.Version)
607+
}
608+
fmt.Printf("################################################################################\n")
609+
}
610+
611+
func PrintModuleReleaseMetas(ctx context.Context, clnt client.Client) {
612+
fmt.Printf("\n#### ModuleReleaseMetas: #######################################################\n")
613+
modulereleasemetas := v1beta2.ModuleReleaseMetaList{}
614+
if err := clnt.List(ctx, &modulereleasemetas); err != nil {
615+
fmt.Printf("%s", fmt.Errorf("while listing ModuleReleaseMetas: %w", err))
616+
}
617+
for i, mrm := range modulereleasemetas.Items {
618+
fmt.Printf("ModuleReleaseMeta %d: name: %s, spec.moduleName: %#v, spec.ocmComponentName: %s, channel mapping:",
619+
i, mrm.Name, mrm.Spec.ModuleName, mrm.Spec.OcmComponentName)
620+
for _, mapping := range mrm.Spec.Channels {
621+
fmt.Printf(" %s->%s;", mapping.Channel, mapping.Version)
622+
}
623+
fmt.Println()
624+
}
625+
fmt.Printf("################################################################################\n")
626+
}
627+
628+
func PrintManifests(ctx context.Context, clnt client.Client) {
629+
fmt.Printf("\n#### Manifests: ################################################################\n")
630+
manifests := v1beta2.ManifestList{}
631+
if err := clnt.List(ctx, &manifests); err != nil {
632+
fmt.Printf("%s", fmt.Errorf("while listing Manifests: %w", err))
633+
}
634+
for i, manifest := range manifests.Items {
635+
fmt.Printf("Manifest %d: name: %s, spec.config: %#v, status.operation: %s\n",
636+
i, manifest.Name, manifest.Spec.Config, manifest.Status.Operation)
637+
}
638+
fmt.Printf("################################################################################\n")
639+
}
640+
641+
func PrintKymas(ctx context.Context, clnt client.Client) {
642+
fmt.Printf("\n#### Kymas: ####################################################################\n")
643+
kymas := v1beta2.KymaList{}
644+
if err := clnt.List(ctx, &kymas); err != nil {
645+
fmt.Printf("%s", fmt.Errorf("while listing Kymas: %w", err))
646+
}
647+
for i, kyma := range kymas.Items {
648+
modules := []string{}
649+
for _, m := range kyma.Spec.Modules {
650+
modules = append(modules, m.Name)
651+
}
652+
fmt.Printf("Kyma %d: name: %s, spec.modules: %v, status.state: %s, status.operation: %s\n",
653+
i, kyma.Name, modules, kyma.Status.State, kyma.Status.Operation)
654+
655+
ser, _ := json.MarshalIndent(kyma.Spec, " ==> ", " ")
656+
fmt.Printf("\nKyma %d spec: %s\n", i, string(ser))
657+
658+
ser, _ = json.MarshalIndent(kyma.Status, " ==> ", " ")
659+
fmt.Printf("\nKyma %d status: %s\n", i, string(ser))
660+
}
661+
fmt.Printf("################################################################################\n")
662+
}

‎tests/integration/controller/kyma/manifest_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,6 @@ var _ = Describe("Manifest.Spec is reset after manual update", Ordered, func() {
197197
moduleTemplate, _, err := GetModuleTemplateInfo(ctx, kcpClient, module, kyma)
198198
Expect(err).NotTo(HaveOccurred())
199199

200-
//time.Sleep(15*time.Second)
201-
//PrintKymas(ctx, kcpClient)
202-
//PrintModuleTemplates(ctx, kcpClient)
203-
//PrintModuleReleaseMetas(ctx, kcpClient)
204-
//PrintManifests(ctx, kcpClient)
205-
206200
expectManifest := expectManifestForFirstModule(kyma)
207201

208202
By("checking Spec.Install")

‎tests/integration/controller/mandatorymodule/installation/controller_test.go‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package mandatory_test
22

33
import (
44
"context"
5-
"encoding/json"
65
"errors"
7-
"fmt"
8-
"time"
96

107
k8slabels "k8s.io/apimachinery/pkg/labels"
118
compdescv2 "ocm.software/ocm/api/ocm/compdesc/versions/v2"
@@ -58,12 +55,6 @@ var _ = Describe("Mandatory Module Installation", Ordered, func() {
5855
})
5956

6057
It("And Manifest CR for the Mandatory Module should be created with correct Owner Reference", func() {
61-
time.Sleep(3 * time.Second)
62-
PrintKymas(ctx, kcpClient)
63-
PrintModuleTemplates(ctx, kcpClient)
64-
PrintModuleReleaseMetas(ctx, kcpClient)
65-
PrintManifests(ctx, kcpClient)
66-
6758
Eventually(checkMandatoryManifestForKyma, Timeout, Interval).
6859
WithContext(ctx).
6960
WithArguments(kyma, "kyma-project.io/module"+"/"+mandatoryModuleName). //TODO: extract constant
@@ -160,69 +151,3 @@ func ConfigureKCPMandatoryModuleReleaseMeta(moduleName, moduleVersion string) *v
160151
WithMandatory(moduleVersion).
161152
Build()
162153
}
163-
164-
func PrintModuleTemplates(ctx context.Context, clnt client.Client) {
165-
fmt.Printf("\n#### ModuleTemplates: ##########################################################\n")
166-
moduletemplates := v1beta2.ModuleTemplateList{}
167-
if err := clnt.List(ctx, &moduletemplates); err != nil {
168-
fmt.Printf("%s", fmt.Errorf("while listing ModuleTemplates: %w", err))
169-
}
170-
for i, mtemplate := range moduletemplates.Items {
171-
fmt.Printf("ModuleTemplate %d: name: %s, spec.moduleName: %q, spec.version: %q\n",
172-
i, mtemplate.Name, mtemplate.Spec.ModuleName, mtemplate.Spec.Version)
173-
}
174-
fmt.Printf("################################################################################\n")
175-
}
176-
177-
func PrintModuleReleaseMetas(ctx context.Context, clnt client.Client) {
178-
fmt.Printf("\n#### ModuleReleaseMetas: #######################################################\n")
179-
modulereleasemetas := v1beta2.ModuleReleaseMetaList{}
180-
if err := clnt.List(ctx, &modulereleasemetas); err != nil {
181-
fmt.Printf("%s", fmt.Errorf("while listing ModuleReleaseMetas: %w", err))
182-
}
183-
for i, mrm := range modulereleasemetas.Items {
184-
fmt.Printf("ModuleReleaseMeta %d: name: %s, spec.moduleName: %#v, spec.ocmComponentName: %s, channel mapping:",
185-
i, mrm.Name, mrm.Spec.ModuleName, mrm.Spec.OcmComponentName)
186-
for _, mapping := range mrm.Spec.Channels {
187-
fmt.Printf(" %s->%s;", mapping.Channel, mapping.Version)
188-
}
189-
fmt.Println()
190-
}
191-
fmt.Printf("################################################################################\n")
192-
}
193-
194-
func PrintManifests(ctx context.Context, clnt client.Client) {
195-
fmt.Printf("\n#### Manifests: ################################################################\n")
196-
manifests := v1beta2.ManifestList{}
197-
if err := clnt.List(ctx, &manifests); err != nil {
198-
fmt.Printf("%s", fmt.Errorf("while listing Manifests: %w", err))
199-
}
200-
for i, manifest := range manifests.Items {
201-
fmt.Printf("Manifest %d: name: %s, spec.config: %#v, status.operation: %s\n",
202-
i, manifest.Name, manifest.Spec.Config, manifest.Status.Operation)
203-
}
204-
fmt.Printf("################################################################################\n")
205-
}
206-
207-
func PrintKymas(ctx context.Context, clnt client.Client) {
208-
fmt.Printf("\n#### Kymas: ####################################################################\n")
209-
kymas := v1beta2.KymaList{}
210-
if err := clnt.List(ctx, &kymas); err != nil {
211-
fmt.Printf("%s", fmt.Errorf("while listing Kymas: %w", err))
212-
}
213-
for i, kyma := range kymas.Items {
214-
modules := []string{}
215-
for _, m := range kyma.Spec.Modules {
216-
modules = append(modules, m.Name)
217-
}
218-
fmt.Printf("Kyma %d: name: %s, spec.modules: %v, status.state: %s, status.operation: %s\n",
219-
i, kyma.Name, modules, kyma.Status.State, kyma.Status.Operation)
220-
221-
ser, _ := json.MarshalIndent(kyma.Spec, " ==> ", " ")
222-
fmt.Printf("\nKyma %d spec: %s\n", i, string(ser))
223-
224-
ser, _ = json.MarshalIndent(kyma.Status, " ==> ", " ")
225-
fmt.Printf("\nKyma %d status: %s\n", i, string(ser))
226-
}
227-
fmt.Printf("################################################################################\n")
228-
}

0 commit comments

Comments
 (0)