chore: change dev version to '0.0.0-dev' (#84)

.chainsaw.yaml

@@ -3,13 +3,13 @@ kind: Configuration
 metadata:
  name: custom-config
 spec:
- namespace: kubedoop-system
  timeouts:
  apply: 120s
- assert: 140s
+ assert: 600s
  cleanup: 120s
  delete: 240s
  error: 120s
  exec: 45s
  skipDelete: false
  failFast: true
+ 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")
@@ -39,7 +39,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)
@@ -57,7 +57,7 @@ endif
 OPERATOR_SDK_VERSION ?= v1.34.2
 
 # Image URL to use all building/pushing image targets
-IMG ?= $(REGISTRY)/$(PROJECT_NAME):v$(VERSION)
+IMG ?= $(REGISTRY)/$(PROJECT_NAME):$(VERSION)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.26.14
 
@@ -260,7 +260,7 @@ bundle-push: ## Push the bundle image.
 bundle-buildx: ## Build the bundle image.
  - $(CONTAINER_TOOL) buildx create --name project-v3-builder
  $(CONTAINER_TOOL) buildx use project-v3-builder
- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag $(BUNDLE_IMG) -f bundle.Dockerfile.cross .
+ $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag $(BUNDLE_IMG) -f bundle.Dockerfile .
  $(CONTAINER_TOOL) buildx rm project-v3-builder
 
 .PHONY: bundle-run
@@ -289,22 +289,14 @@ OPM = $(shell which opm)
 endif
 endif
 
-# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0).
-# These images MUST exist in a registry and be pull-able.
-BUNDLE_IMGS ?= $(BUNDLE_IMG)
-
-# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
-ifneq ($(origin CATALOG_BASE_IMG), undefined)
-FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG)
-endif
 
 # Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
 # This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:latest
 
-.PHONY: catalog-build
-catalog-build: opm ## Build a catalog manifests.
+.PHONY: catalog
+catalog: opm ## Build a catalog manifests.
  mkdir -p catalog
  @if ! test -f ./catalog.Dockerfile; then \
  $(OPM) generate dockerfile catalog; \
@@ -320,17 +312,17 @@ catalog-validate: opm ## Validate a catalog manifests.
 #catalog-render: opm ## render a bundle to catalog.
 # $(OPM) render $(BUNDLE_IMGS) --output=yaml >> catalog/catalog.yaml
 
-.PHONY: catalog-docker-build
-catalog-docker-build: ## Build a catalog image.
+.PHONY: catalog-build
+catalog-build: ## Build a catalog image.
  $(CONTAINER_TOOL) build -t ${CATALOG_IMG} -f catalog.Dockerfile .
 
 # Push the catalog image.
 .PHONY: catalog-docker-push
 catalog-docker-push: ## Push a catalog image.
  $(MAKE) docker-push IMG=$(CATALOG_IMG)
 
-.PHONY: catalog-docker-buildx
-catalog-docker-buildx: ## Build and push a catalog image for cross-platform support
+.PHONY: catalog-buildx
+catalog-buildx: ## Build and push a catalog image for cross-platform support
  - $(CONTAINER_TOOL) buildx create --name project-v3-builder
  $(CONTAINER_TOOL) buildx use project-v3-builder
  $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) -f catalog.Dockerfile --tag ${CATALOG_IMG} .

catalog-template.yaml

@@ -105,7 +105,7 @@ schema: olm.channel
 package: kafka-operator
 name: stable
 entries:
- - name: kafka-operator.v0.0.1
+ - name: kafka-operator.v0.0.0-dev
 ---
 schema: olm.bundle
-image: quay.io/zncdata/kafka-operator-bundle:v0.0.1
+image: quay.io/zncdata/kafka-operator-bundle:0.0.0-dev

config/manager/kustomization.yaml

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

config/manifests/bases/kafka-operator.clusterserviceversion.yaml

@@ -43,8 +43,8 @@ spec:
  - name: kafka
  url: https://kafka.apache.org/
  maintainers:
-  - email: zncdatadev@googlegroups.com
-  name: ZNCDataDev Team
+ - email: zncdatadev@googlegroups.com
+ name: ZNCDataDev Team
  maturity: stable
  minKubeVersion: 1.26.1
  provider:

test/e2e/default/kafka.yaml

@@ -23,9 +23,9 @@ spec:
  resources:
  cpu:
  min: 1
- max: 2
+ max: 4
  memory:
- limit: "3Gi"
+ limit: "4Gi"
  logging:
  broker:
  loggers:
@@ -34,4 +34,4 @@ spec:
  console:
  level: WARN
  file:
- level: ERROR
+ level: ERROR

test/e2e/vector/chainsaw-test.yaml

@@ -1,7 +1,7 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
- name: default
+ name: vector
 spec:
  steps:
  - try:
@@ -38,4 +38,4 @@ spec:
  file: kafka-assert.yaml
  cleanup:
  - sleep:
- duration: 10s
+ duration: 10s

test/e2e/vector/kafka.yaml

@@ -26,10 +26,10 @@ spec:
  config:
  resources:
  cpu:
- min: 1
- max: 2
+ min: 300m
+ max: 4
  memory:
- limit: "3Gi"
+ limit: "4Gi"
  logging:
  enableVectorAgent: true