diff --git a/.chainsaw.yaml b/.chainsaw.yaml index 45e1751..5a80f0b 100644 --- a/.chainsaw.yaml +++ b/.chainsaw.yaml @@ -11,5 +11,5 @@ spec: delete: 120s error: 300s exec: 200s - skipDelete: true + skipDelete: false failFast: true diff --git a/test/e2e/default/00-assert.yaml b/test/e2e/default/00-assert.yaml deleted file mode 100644 index 9f37ead..0000000 --- a/test/e2e/default/00-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack-operators -status: - phase: Active ---- -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack -status: - phase: Active ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: CatalogSource -metadata: - name: kubedata-catalog - namespace: olm -status: - connectionState: - lastObservedState: READY diff --git a/test/e2e/default/00-olm.yaml b/test/e2e/default/00-olm.yaml deleted file mode 100644 index 622c06c..0000000 --- a/test/e2e/default/00-olm.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack-operators ---- -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: zncdata-stack - namespace: kubedatastack-operators -spec: - # if not specified, the operator group will target all namespaces - # so the operator will be able to watch and manage resources in all namespaces - targetNamespaces: - - kubedatastack ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: CatalogSource -metadata: - name: kubedata-catalog - namespace: olm -spec: - sourceType: grpc - grpcPodConfig: - securityContextConfig: restricted - image: quay.io/zncdatadev/kubedata-catalog:latest - displayName: kubedata-catalog - publisher: zncdatadev - updateStrategy: - registryPoll: - interval: 20m - diff --git a/test/e2e/default/01-assert.yaml b/test/e2e/default/01-assert.yaml deleted file mode 100644 index 5ec26a6..0000000 --- a/test/e2e/default/01-assert.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: zookeeper-operator-controller-manager - namespace: kubedatastack-operators -status: - availableReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: listener-operator-controller-manager - namespace: kubedatastack-operators -status: - availableReplicas: 1 diff --git a/test/e2e/default/01-subs.yaml b/test/e2e/default/01-subs.yaml deleted file mode 100644 index f3045cd..0000000 --- a/test/e2e/default/01-subs.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: listener-sub - namespace: kubedatastack-operators -spec: - channel: stable - name: listener-operator - source: kubedata-catalog - sourceNamespace: olm - installPlanApproval: Automated ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: zookeeper-sub - namespace: kubedatastack-operators -spec: - channel: stable - name: zookeeper-operator - source: kubedata-catalog - sourceNamespace: olm - installPlanApproval: Automated diff --git a/test/e2e/default/02-assert.yaml b/test/e2e/default/02-assert.yaml deleted file mode 100644 index 698f068..0000000 --- a/test/e2e/default/02-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: listenercsi-sample-csi - namespace: kubedatastack -status: - currentNumberScheduled: 1 - desiredNumberScheduled: 1 - numberAvailable: 1 - numberMisscheduled: 0 - numberReady: 1 - observedGeneration: 1 - updatedNumberScheduled: 1 diff --git a/test/e2e/default/02-listener.yaml b/test/e2e/default/02-listener.yaml deleted file mode 100644 index 032a89a..0000000 --- a/test/e2e/default/02-listener.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: listeners.zncdata.dev/v1alpha1 -kind: ListenerCSI -metadata: - labels: - app.kubernetes.io/name: listenercsi - app.kubernetes.io/instance: listenercsi-sample - app.kubernetes.io/part-of: listener-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: listener-operator - name: listenercsi-sample - namespace: kubedatastack -spec: - csiDriver: - repository: quay.io/zncdatadev/listener-csi-driver - tag: v0.0.1 - pullPolicy: IfNotPresent - logging: - level: "10" - nodeDriverRegistrar: - repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.8.0 - pullPolicy: IfNotPresent - logging: - level: "10" - csiProvisioner: - repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.5.0 - pullPolicy: IfNotPresent - logging: - level: "10" - livenessProbe: - repository: registry.k8s.io/sig-storage/livenessprobe - tag: v2.11.0 - pullPolicy: IfNotPresent - logging: - level: "10" - diff --git a/test/e2e/default/03-assert.yaml b/test/e2e/default/03-assert.yaml deleted file mode 100644 index 5a3c569..0000000 --- a/test/e2e/default/03-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: zookeepercluster-sample-default - namespace: kubedatastack -status: - availableReplicas: 2 - replicas: 2 ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: sample-hdfs-znode - namespace: kubedatastack diff --git a/test/e2e/default/03-zookeeper.yaml b/test/e2e/default/03-zookeeper.yaml deleted file mode 100644 index 3f7a094..0000000 --- a/test/e2e/default/03-zookeeper.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: zookeeper.zncdata.dev/v1alpha1 -kind: ZookeeperCluster -metadata: - labels: - app.kubernetes.io/name: zookeepercluster - app.kubernetes.io/instance: zookeepercluster-sample - app.kubernetes.io/part-of: zookeeper-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: zookeeper-operator - name: zookeepercluster-sample - namespace: kubedatastack -spec: - image: - repository: docker.io/bitnami/zookeeper - tag: 3.9.1-debian-12-r15 - clusterConfig: - service: - type: NodePort - port: 2181 - server: - config: - resources: - cpu: - min: "100m" - max: "200m" - memory: - limit: "1Gi" - roleGroups: - default: - replicas: 2 - config: - logging: - zookeeperCluster: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: INFO ---- -apiVersion: zookeeper.zncdata.dev/v1alpha1 -kind: ZookeeperZnode -metadata: - labels: - app.kubernetes.io/name: zookeeperznode - app.kubernetes.io/instance: zookeeperznode-sample - app.kubernetes.io/part-of: zookeeper-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: zookeeper-operator - name: sample-hdfs-znode - namespace: kubedatastack -spec: - clusterRef: - name: zookeepercluster-sample - namespace: kubedatastack - diff --git a/test/e2e/default/04-assert.yaml b/test/e2e/default/04-assert.yaml deleted file mode 100644 index 2dbb989..0000000 --- a/test/e2e/default/04-assert.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-journalnode -status: - availableReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-namenode -status: - availableReplicas: 2 - replicas: 2 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-datanode -status: - availableReplicas: 2 - replicas: 2 \ No newline at end of file diff --git a/test/e2e/default/04-hdfs.yaml b/test/e2e/default/04-hdfs.yaml deleted file mode 100644 index dfaa310..0000000 --- a/test/e2e/default/04-hdfs.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: hdfs.zncdata.dev/v1alpha1 -kind: HdfsCluster -metadata: - labels: - app.kubernetes.io/name: hdfscluster - app.kubernetes.io/instance: hdfscluster-sample - app.kubernetes.io/part-of: hdfs-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: hdfs-operator - name: hdfscluster-sample - namespace: kubedatastack -spec: - image: - repository: quay.io/zncdatadev/hadoop - tag: 3.3.4 - clusterConfig: - zookeeperDiscoveryZNode: sample-hdfs-znode - nameNode: - roleGroups: - default: - replicas: 2 - config: - resources: - cpu: - min: 200m - max: 500m - memory: - limit: "1Gi" - logging: - namenode: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: ERROR - formatNameNode: - loggers: - test-format: - level: DEBUG - journalNode: - roleGroups: - default: - replicas: 1 - config: - resources: - cpu: - min: 100m - max: 300m - memory: - limit: "1Gi" - logging: - journalNode: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: ERROR - dataNode: - roleGroups: - default: - replicas: 2 - config: - resources: - cpu: - min: 200m - max: 500m - memory: - limit: "1Gi" - logging: - datanode: - loggers: - test: - level: DEBUG - console: - level: WARN diff --git a/test/e2e/kerberos/05-assert.yaml b/test/e2e/kerberos/05-assert.yaml index f527972..887ebee 100644 --- a/test/e2e/kerberos/05-assert.yaml +++ b/test/e2e/kerberos/05-assert.yaml @@ -11,14 +11,19 @@ kind: StatefulSet metadata: name: hdfscluster-sample-default-namenode status: - availableReplicas: 2 - replicas: 2 + availableReplicas: 1 + replicas: 1 --- apiVersion: apps/v1 kind: StatefulSet metadata: name: hdfscluster-sample-default-datanode status: - availableReplicas: 2 - replicas: 2 - + availableReplicas: 1 + replicas: 1 +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: hdfscluster-sample + namespace: kubedatastack \ No newline at end of file diff --git a/test/e2e/kerberos/05-hdfs.yaml b/test/e2e/kerberos/05-hdfs.yaml index 731b106..8dd8e2d 100644 --- a/test/e2e/kerberos/05-hdfs.yaml +++ b/test/e2e/kerberos/05-hdfs.yaml @@ -21,16 +21,15 @@ spec: jksPassword: "123456" kerberos: secretClass: kerberos-hdfs - nameNode: roleGroups: default: - replicas: 2 + replicas: 1 config: resources: cpu: min: 200m - max: 1500m + max: 800m memory: limit: "2Gi" logging: @@ -54,7 +53,7 @@ spec: resources: cpu: min: 100m - max: 1500m + max: 500m memory: limit: "1Gi" logging: @@ -69,12 +68,12 @@ spec: dataNode: roleGroups: default: - replicas: 2 + replicas: 1 config: resources: cpu: min: 200m - max: 1500m + max: 600m memory: limit: "2Gi" logging: