chore: change dev version to '0.0.0-dev'

.chainsaw.yaml

@@ -5,13 +5,12 @@ metadata:
 spec:
   timeouts:
     apply: 300s
-    assert: 300s
+    assert: 600s
     cleanup: 120s
     delete: 120s
     error: 180s
     exec: 300s
   skipDelete: false
-  # skipDelete: true
   failFast: true
   forceTerminationGracePeriod: 10s
   parallel: 1

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.0.1
+VERSION ?= 0.0.0-dev
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -38,7 +38,7 @@ IMAGE_TAG_BASE ?= $(REGISTRY)/$(PROJECT_NAME)
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
+BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
 BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
@@ -56,7 +56,7 @@ endif
 OPERATOR_SDK_VERSION ?= v1.35.0
 
 # Image URL to use all building/pushing image targets
-IMG ?= $(IMAGE_TAG_BASE):v$(VERSION)
+IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26.1
 

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/zncdatadev/hbase-operator
-  newTag: v0.0.1
+  newTag: 0.0.0-dev

test/e2e/default/chainsaw-test.yaml

@@ -30,12 +30,12 @@ spec:
         file: ../setup/hdfs-assert.yaml
     cleanup:
     - sleep:
-        duration: 20s
+        duration: 30s
   - try:
     - apply:
         file: hbase.yaml
     - assert:
         file: hbase-assert.yaml
     cleanup:
     - sleep:
-        duration: 10s
+        duration: 20s

test/e2e/kerberos/chainsaw-test.yaml

@@ -106,6 +106,8 @@ spec:
         file: hdfs.yaml
     - assert:
         file: hdfs-assert.yaml
+    - sleep:
+        duration: 10s
     - script:
         timeout: 300s
         env:
@@ -117,32 +119,31 @@ spec:
           # debug node info
           kubectl get node
 
-          # pod name krb5-hdfs-default-namenode-0
-          kubectl exec -n $NAMESPACE krb5-hdfs-default-namenode-0 -c namenode -- sh -c "
+          kubectl exec -n $NAMESPACE krb5-hdfs-default-namenode-0 -c namenode -- sh -c '
             set -ex
-            klist -kt /zncdata/kerberos/keytab | awk 'NR>3 {print \$4}' | head -n 1
-            echo init krb5
-            PRINCIPAL=\$(klist -kt /zncdata/kerberos/keytab | awk "'"NR>3 {print \$4}"'" | head -n 1)
-            echo current principal: $PRINCIPAL
-            kinit -kt /zncdata/kerberos/keytab \$PRINCIPAL
+            klist -kt /kubedoop/kerberos/keytab | awk "NR>3 {print \$4}" | head -n 1
+            echo "init krb5"
+            PRINCIPAL=$(klist -kt /kubedoop/kerberos/keytab | awk "NR>3 {print \$4}" | head -n 1)
+            echo "current principal: $PRINCIPAL"
+            kinit -kt /kubedoop/kerberos/keytab $PRINCIPAL
+            klist
 
             if hdfs dfs -test -d /hbase; then
-              echo hbase dir exist, everything is ok
+              echo "hbase dir exist, everything is ok"
             else
-              echo hbase dir not exist, create it
+              echo "hbase dir not exist, create it"
               hdfs dfs -mkdir -p /hbase
               hdfs dfs -chown hbase /hbase
             fi
-          "
-
+          '
     cleanup:
     - sleep:
-        duration: 20s
+        duration: 30s
   - try:
     - apply:
         file: hbase.yaml
     - assert:
         file: hbase-assert.yaml
     cleanup:
     - sleep:
-        duration: 10s
+        duration: 20s

test/e2e/kerberos/hdfs.yaml

@@ -24,9 +24,6 @@ metadata:
     app.kubernetes.io/created-by: hdfs-operator
   name: krb5-hdfs
 spec:
-  image:
-    repository: quay.io/zncdatadev/hadoop
-    tag: 3.3.4
   clusterConfig:
     zookeeperConfigMapName: krb5-hdfs-znode
     authentication:
@@ -39,12 +36,6 @@ spec:
       default:
         replicas: 2
         config:
-          resources:
-            cpu:
-              min: 200m
-              max: 1000m
-            memory:
-              limit: "1000Mi"
           logging:
             namenode:
               loggers:
@@ -63,12 +54,6 @@ spec:
       default:
         replicas: 1
         config:
-          resources:
-            cpu:
-              min: 100m
-              max: 500m
-            memory:
-              limit: "500Mi"
           logging:
             journalNode:
               loggers:
@@ -83,12 +68,6 @@ spec:
       default:
         replicas: 2
         config:
-          resources:
-            cpu:
-              min: 200m
-              max: 1000m
-            memory:
-              limit: "1000Mi"
           logging:
             datanode:
               loggers:

test/e2e/setup/hdfs.yaml

@@ -24,9 +24,6 @@ metadata:
     app.kubernetes.io/created-by: hdfs-operator
   name: hdfs
 spec:
-  image:
-    repository: quay.io/zncdatadev/hadoop
-    tag: 3.3.4
   clusterConfig:
     zookeeperConfigMapName: hdfs-znode
   nameNode:
@@ -35,12 +32,6 @@ spec:
         replicas: 2
         config:
           listenerClass: external-unstable
-          resources:
-            cpu:
-              min: 200m
-              max: 500m
-            memory:
-              limit: "500Mi"
           logging:
             namenode:
               loggers:
@@ -60,12 +51,6 @@ spec:
         replicas: 1
         config:
           listenerClass: external-stable
-          resources:
-            cpu:
-              min: 100m
-              max: 500m
-            memory:
-              limit: "500Mi"
           logging:
             journalNode:
               loggers:
@@ -80,12 +65,6 @@ spec:
       default:
         replicas: 2
         config:
-          resources:
-            cpu:
-              min: 200m
-              max: 800m
-            memory:
-              limit: "500Mi"
           logging:
             datanode:
               loggers:

test/e2e/setup/olm-assert.yaml

@@ -2,12 +2,12 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: zncdata-stack
+  name: kubedoop
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: kubedata-catalog
+  name: kubedoop-catalog
 status:
   connectionState:
     lastObservedState: READY

test/e2e/setup/olm.yaml

@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  name: zncdata-stack
+  name: kubedoop
 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
@@ -11,11 +11,11 @@ spec:
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: kubedata-catalog
+  name: kubedoop-catalog
 spec:
   sourceType: grpc
-  image: quay.io/zncdatadev/kubedata-catalog:latest
-  displayName: kubedata-catalog
+  image: quay.io/zncdatadev/kubedoop-catalog:latest
+  displayName: kubedoop-catalog
   publisher: zncdatadev
   updateStrategy:
     registryPoll:

test/e2e/setup/subs.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   channel: stable
   name: commons-operator
-  source: kubedata-catalog
+  source: kubedoop-catalog
   sourceNamespace: ($namespace)
   installPlanApproval: Automated
 ---
@@ -17,7 +17,7 @@ metadata:
 spec:
   channel: stable
   name: listener-operator
-  source: kubedata-catalog
+  source: kubedoop-catalog
   sourceNamespace: ($namespace)
   installPlanApproval: Automated
 ---
@@ -28,7 +28,7 @@ metadata:
 spec:
   channel: stable
   name: secret-operator
-  source: kubedata-catalog
+  source: kubedoop-catalog
   sourceNamespace: ($namespace)
   installPlanApproval: Automated
 ---
@@ -39,7 +39,7 @@ metadata:
 spec:
   channel: stable
   name: zookeeper-operator
-  source: kubedata-catalog
+  source: kubedoop-catalog
   sourceNamespace: ($namespace)
   installPlanApproval: Automated
 ---
@@ -50,6 +50,6 @@ metadata:
 spec:
   channel: stable
   name: hdfs-operator
-  source: kubedata-catalog
+  source: kubedoop-catalog
   sourceNamespace: ($namespace)
   installPlanApproval: Automated