Skip to content

Commit e36aabf

Browse files
committed
Update label on the test
Signed-off-by: chiragkyal <ckyal@redhat.com>
1 parent cb5500c commit e36aabf

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,8 @@ test-unit: vet ## Run unit tests.
213213
# E2E_TIMEOUT is the timeout for e2e tests.
214214
E2E_TIMEOUT ?= 1h
215215
# E2E_GINKGO_LABEL_FILTER is ginkgo label query for selecting tests. See
216-
# https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform
217-
# and platform-agnostic tests (Platform:Generic).
218-
E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS, Generic}"
216+
# https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform.
217+
E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS}"
219218
.PHONY: test-e2e
220219
test-e2e: ## Run e2e tests against a cluster.
221220
@echo "Running go e2e tests..."

pkg/controller/external_secrets/configmap.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ func (r *Reconciler) ensureTrustedCABundleConfigMap(esc *operatorv1alpha1.Extern
6666
if !apierrors.IsAlreadyExists(err) {
6767
return common.FromClientError(err, "failed to create %s trusted CA bundle ConfigMap resource", configMapName)
6868
}
69-
r.log.V(1).Info("trusted CA bundle ConfigMap exists on API server but absent from label-filtered cache, patching metadata", "name", configMapName)
70-
if patchErr := r.patchResourceMetadata(desiredConfigMap, resourceMetadata); patchErr != nil {
71-
return common.FromClientError(patchErr, "failed to patch %s trusted CA bundle ConfigMap metadata", configMapName)
72-
}
69+
r.log.V(1).Info("trusted CA bundle ConfigMap exists on API server but absent from label-filtered cache, patching metadata", "name", configMapName)
70+
if patchErr := r.patchResourceMetadata(desiredConfigMap, resourceMetadata); patchErr != nil {
71+
return common.FromClientError(patchErr, "failed to patch %s trusted CA bundle ConfigMap metadata", configMapName)
72+
}
7373
r.eventRecorder.Eventf(esc, corev1.EventTypeNormal, "Reconciled", "trusted CA bundle ConfigMap resource %s restored to desired state", configMapName)
7474
return nil
7575
}

test/e2e/e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ var _ = Describe("External Secrets Operator End-to-End test scenarios", Ordered,
10561056

10571057
})
10581058

1059-
Context("Managed Label Restoration", Label("Platform:Generic"), func() {
1059+
Context("Managed Label Restoration", Label("Platform:AWS"), func() {
10601060
const (
10611061
managedLabelKey = "app"
10621062
managedLabelValue = "external-secrets"

0 commit comments

Comments
 (0)