diff --git a/fixtures/datasources/_setup.yaml b/fixtures/datasources/_setup.yaml index f0ac97d82..1ba0955e2 100644 --- a/fixtures/datasources/_setup.yaml +++ b/fixtures/datasources/_setup.yaml @@ -579,16 +579,10 @@ metadata: name: jmeter-fail-test namespace: default --- -apiVersion: v1 -kind: Namespace -metadata: - name: ldap ---- kind: ConfigMap apiVersion: v1 metadata: name: apacheds-ldif - namespace: ldap data: users.ldif: | ######################################################### @@ -706,7 +700,6 @@ metadata: labels: app: apacheds name: apacheds - namespace: ldap spec: replicas: 1 selector: @@ -750,7 +743,6 @@ apiVersion: v1 kind: Service metadata: name: apacheds - namespace: ldap spec: ports: - name: ldap @@ -784,4 +776,4 @@ subjects: roleRef: apiGroup: "" kind: ClusterRole - name: test-rbac-ldap \ No newline at end of file + name: test-rbac-ldap diff --git a/fixtures/datasources/ldap_pass.yaml b/fixtures/datasources/ldap_pass.yaml index 199a2e282..82374fae0 100644 --- a/fixtures/datasources/ldap_pass.yaml +++ b/fixtures/datasources/ldap_pass.yaml @@ -5,7 +5,7 @@ metadata: spec: interval: 30 ldap: - - url: ldap://apacheds.ldap.svc.cluster.local:10389 + - url: ldap://apacheds.default.svc.cluster.local:10389 name: ldap user login username: value: uid=admin,ou=system @@ -13,7 +13,7 @@ spec: value: secret bindDN: ou=users,dc=example,dc=com userSearch: "(&(objectClass=organizationalPerson))" - - url: ldap://apacheds.ldap.svc.cluster.local:10389 + - url: ldap://apacheds.default.svc.cluster.local:10389 name: ldap group login username: value: uid=admin,ou=system diff --git a/fixtures/kustomization.yaml b/fixtures/kustomization.yaml index a869bb91c..b5af0d983 100644 --- a/fixtures/kustomization.yaml +++ b/fixtures/kustomization.yaml @@ -1,10 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -bases: +resources: - datasources - k8s - minimal - git - topology -resources: - - _setup.yaml \ No newline at end of file + - _setup.yaml