Skip to content

Commit 41070eb

Browse files
committed
Add kubeconfig file path log to kind provisioner
Signed-off-by: Per G. da Silva <[email protected]>
1 parent e02d21a commit 41070eb

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

Diff for: deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,4 +245,4 @@ spec:
245245
served: true
246246
storage: true
247247
subresources:
248-
status: {}
248+
status: {}

Diff for: pkg/controller/registry/reconciler/reconciler_test.go

+23-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
130130
expectedNodeSelectors map[string]string
131131
expectedTolerations []corev1.Toleration
132132
expectedPriorityClassName string
133+
annotations map[string]string
133134
}{
134135
{
135136
title: "no overrides",
@@ -238,11 +239,32 @@ func TestPodSchedulingOverrides(t *testing.T) {
238239
expectedTolerations: overriddenTolerations,
239240
expectedPriorityClassName: overriddenPriorityClassName,
240241
expectedNodeSelectors: overriddenNodeSelectors,
242+
}, {
243+
title: "priorityClassName annotation takes precedence",
244+
catalogSource: &v1alpha1.CatalogSource{
245+
ObjectMeta: metav1.ObjectMeta{
246+
Name: "test",
247+
Namespace: "testns",
248+
},
249+
Spec: v1alpha1.CatalogSourceSpec{
250+
SourceType: v1alpha1.SourceTypeGrpc,
251+
Image: "repo/image:tag",
252+
GrpcPodConfig: &v1alpha1.GrpcPodConfig{
253+
PriorityClassName: &overriddenPriorityClassName,
254+
},
255+
},
256+
},
257+
expectedTolerations: nil,
258+
annotations: map[string]string{
259+
CatalogPriorityClassKey: "some-OTHER-prio-class",
260+
},
261+
expectedPriorityClassName: "some-OTHER-prio-class",
262+
expectedNodeSelectors: defaultNodeSelectors,
241263
},
242264
}
243265

244266
for _, testCase := range testCases {
245-
pod := Pod(testCase.catalogSource, "hello", "busybox", "", map[string]string{}, map[string]string{}, int32(0), int32(0))
267+
pod := Pod(testCase.catalogSource, "hello", "busybox", "", map[string]string{}, testCase.annotations, int32(0), int32(0))
246268
require.Equal(t, testCase.expectedNodeSelectors, pod.Spec.NodeSelector)
247269
require.Equal(t, testCase.expectedPriorityClassName, pod.Spec.PriorityClassName)
248270
require.Equal(t, testCase.expectedTolerations, pod.Spec.Tolerations)

Diff for: test/e2e/ctx/provisioner_kind.go

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ func Provision(ctx *TestContext) (func(), error) {
8383
}
8484
kubeconfigPath := filepath.Join(dir, "kubeconfig")
8585

86+
fmt.Printf("kubeconfig: %s\n", kubeconfigPath)
8687
provider := cluster.NewProvider(
8788
cluster.ProviderWithLogger(kindLogAdapter{ctx}),
8889
)

0 commit comments

Comments
 (0)