diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 09f202f..7e53768 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = True tag = True -current_version = 1.0.3 +current_version = 1.0.4 parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-rc(?P\d+))? serialize = {major}.{minor}.{patch}-rc{rc} diff --git a/Makefile b/Makefile index 15c2600..bdaa4db 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PROJECTNAME=$(shell basename "$(PWD)") CLUSTER_VERSION="1.18.8" KIND_CLUSTER_NAME="k8spin-operator" PYTEST_PARAMS="" -TAG_VERSION="v1.0.3" +TAG_VERSION="v1.0.4" REGISTRY="ghcr.io" .PHONY: help cluster-up cluster-down build deploy update test-e2e test-kubeconfig load kubie publish_container_image helm_chart_docs check_helm_chart_docs clean diff --git a/README.md b/README.md index 62c8630..b8d7da5 100644 --- a/README.md +++ b/README.md @@ -49,17 +49,17 @@ $ kind create cluster # Deploy cert-manager $ helm repo add jetstack https://charts.jetstack.io $ helm repo update -$ helm install cert-manager jetstack/cert-manager --version v1.0.3 --set installCRDs=true +$ helm install cert-manager jetstack/cert-manager --version v1.0.4 --set installCRDs=true $ kubectl wait --for=condition=Available deployment --timeout=2m -n cert-manager --all # Deploy K8Spin operator $ export HELM_EXPERIMENTAL_OCI="1" -$ helm chart pull ghcr.io/k8spin/k8spin-operator-chart:v1.0.3 -v1.0.3: Pulling from ghcr.io/k8spin/k8spin-operator-chart -ref: ghcr.io/k8spin/k8spin-operator-chart:v1.0.3 +$ helm chart pull ghcr.io/k8spin/k8spin-operator-chart:v1.0.4 +v1.0.4: Pulling from ghcr.io/k8spin/k8spin-operator-chart +ref: ghcr.io/k8spin/k8spin-operator-chart:v1.0.4 name: k8spin-operator -version: v1.0.3 -Status: Downloaded newer chart for ghcr.io/k8spin/k8spin-operator-chart:v1.0.3 -$ helm chart export ghcr.io/k8spin/k8spin-operator-chart:v1.0.3 +version: v1.0.4 +Status: Downloaded newer chart for ghcr.io/k8spin/k8spin-operator-chart:v1.0.4 +$ helm chart export ghcr.io/k8spin/k8spin-operator-chart:v1.0.4 $ helm install k8spin-operator ./k8spin-operator $ kubectl wait --for=condition=Available deployment --timeout=2m --all ``` diff --git a/deployments/helm/k8spin-operator/Chart.yaml b/deployments/helm/k8spin-operator/Chart.yaml index 37c8750..f32d3cc 100644 --- a/deployments/helm/k8spin-operator/Chart.yaml +++ b/deployments/helm/k8spin-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: k8spin-operator type: application -version: "v1.0.3" -appVersion: "v1.0.3" +version: "v1.0.4" +appVersion: "v1.0.4" description: A Helm chart for k8spin-operator diff --git a/deployments/helm/k8spin-operator/README.md b/deployments/helm/k8spin-operator/README.md index 563f5ce..8fdb903 100644 --- a/deployments/helm/k8spin-operator/README.md +++ b/deployments/helm/k8spin-operator/README.md @@ -11,15 +11,15 @@ The following table lists the configurable parameters of the K8spin-operator cha | Parameter | Description | Default | | ------------------------ | ----------------------- | -------------- | -| `k8spin_operator.image.name` | K8spin-operator image name | `"k8spin/k8spin-operator"` | -| `k8spin_operator.image.tag` | K8spin-operator image tag | `"dev"` | +| `k8spin_operator.image.name` | K8spin-operator image name | `"ghcr.io/k8spin/k8spin-operator"` | +| `k8spin_operator.image.tag` | K8spin-operator image tag | `"v1.0.4"` | | `k8spin_operator.image.pullPolicy` | K8spin-operator image pull policy | `"IfNotPresent"` | | `k8spin_operator.logging_level` | K8spin-operator logging level | `"DEBUG"` | | `k8spin_operator.reconciliation_interval_seconds` | K8spin-operator reconciliation interval in seconds | `"15"` | | `k8spin_operator.serviceAccount.create` | Create the k8spin-operator service account | `true` | | `k8spin_operator.serviceAccount.name` | The k8spin-operator service account name | `null` | -| `k8spin_webhook.image.name` | K8spin-webhook image name | `"k8spin/k8spin-webhook"` | -| `k8spin_webhook.image.tag` | K8spin-webhook image tag | `"dev"` | +| `k8spin_webhook.image.name` | K8spin-webhook image name | `"ghcr.io/k8spin/k8spin-webhook"` | +| `k8spin_webhook.image.tag` | K8spin-webhook image tag | `"v1.0.4"` | | `k8spin_webhook.image.pullPolicy` | K8spin-webhook image pull policy | `"IfNotPresent"` | | `k8spin_webhook.logging_level` | K8spin-webhook logging level | `"DEBUG"` | | `k8spin_webhook.serviceAccount.create` | Create the k8spin-webhook service account | `true` | diff --git a/deployments/helm/k8spin-operator/values.yaml b/deployments/helm/k8spin-operator/values.yaml index 7b6a965..28f3e86 100644 --- a/deployments/helm/k8spin-operator/values.yaml +++ b/deployments/helm/k8spin-operator/values.yaml @@ -1,7 +1,7 @@ k8spin_operator: image: name: ghcr.io/k8spin/k8spin-operator # k8spin-operator image name - tag: v1.0.3 # k8spin-operator image tag + tag: v1.0.4 # k8spin-operator image tag pullPolicy: IfNotPresent # k8spin-operator image pull policy logging_level: DEBUG # k8spin-operator logging level reconciliation_interval_seconds: "15" # k8spin-operator reconciliation interval in seconds @@ -12,7 +12,7 @@ k8spin_operator: k8spin_webhook: image: name: ghcr.io/k8spin/k8spin-webhook # k8spin-webhook image name - tag: v1.0.3 # k8spin-webhook image tag + tag: v1.0.4 # k8spin-webhook image tag pullPolicy: IfNotPresent # k8spin-webhook image pull policy logging_level: DEBUG # k8spin-webhook logging level serviceAccount: diff --git a/deployments/kubernetes/operator.yaml b/deployments/kubernetes/operator.yaml index aa7becc..8114ebd 100644 --- a/deployments/kubernetes/operator.yaml +++ b/deployments/kubernetes/operator.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: k8spin-operator containers: - name: k8spin-operator - image: k8spin/k8spin-operator:v1.0.3 + image: k8spin/k8spin-operator:v1.0.4 env: - name: LOGGING_LEVEL value: DEBUG diff --git a/deployments/kubernetes/webhook.yaml b/deployments/kubernetes/webhook.yaml index 16305bc..f3efbab 100644 --- a/deployments/kubernetes/webhook.yaml +++ b/deployments/kubernetes/webhook.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: k8spin-webhook containers: - name: k8spin-webhook - image: k8spin/k8spin-webhook:v1.0.3 + image: k8spin/k8spin-webhook:v1.0.4 ports: - containerPort: 443 env: diff --git a/kubectl-k8spin.py b/kubectl-k8spin.py index 51cbde2..d51e298 100755 --- a/kubectl-k8spin.py +++ b/kubectl-k8spin.py @@ -337,6 +337,6 @@ def delete_space(arg: CommandArguments): method_to_call = locals()[f"{command}_{sub_command}"] method_to_call(arg) elif command == "version": - print("K8SPin v1.0.3") + print("K8SPin v1.0.4") else: parser.print_help() diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py index 60cd731..ab598ae 100644 --- a/test/e2e/conftest.py +++ b/test/e2e/conftest.py @@ -14,10 +14,10 @@ def cluster(kind_cluster) -> Generator[dict, None, None]: kubectl = kind_cluster.kubectl - operator_image = "k8spin/k8spin-operator:v1.0.3" + operator_image = "k8spin/k8spin-operator:v1.0.4" kind_cluster.load_docker_image(operator_image) - webhook_image = "k8spin/k8spin-webhook:v1.0.3" + webhook_image = "k8spin/k8spin-webhook:v1.0.4" kind_cluster.load_docker_image(webhook_image) logging.info("Deploying Calico")