Skip to content

Commit e4286a1

Browse files
Bug fix for 4.2.0 (#427)
* fixing rack id change validation * fixing nil namespace name in aerospike config. * Fix pod event filter * Updating management-lib and go-client * updated NOTES.txt, README.md in the helm-charts * Update init tag: 2.4.0 and ako tag: 4.2.0 --------- Co-authored-by: Abhisek Dwivedi <adwivedi@aerospike.com>
1 parent 9b7d6cd commit e4286a1

39 files changed

+160
-126
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} GO111MODULE=on go
2727
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
2828

2929
# Version of Operator (build arg)
30-
ARG VERSION="4.2.0-dev1"
30+
ARG VERSION="4.2.0"
3131

3232
# User to run container as
3333
ARG USER="root"

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pipeline {
2323

2424
AEROSPIKE_CUSTOM_INIT_REGISTRY="568976754000.dkr.ecr.ap-south-1.amazonaws.com"
2525
AEROSPIKE_CUSTOM_INIT_REGISTRY_NAMESPACE="aerospike"
26-
AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.4.0-dev3"
26+
AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.4.0"
2727
}
2828

2929
stages {

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ OPENSHIFT_VERSION="v4.10"
1111
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
1212
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
1313
# TODO: Version must be pulled from git tags
14-
VERSION ?= 4.2.0-dev1
14+
VERSION ?= 4.2.0
1515

1616
# Platforms supported
1717
PLATFORMS ?= linux/amd64,linux/arm64
@@ -188,14 +188,14 @@ run: manifests generate fmt vet ## Run a controller from your host.
188188
docker-buildx: ## Build and push docker image for the manager for cross-platform support
189189
- docker buildx create --name project-v3-builder
190190
docker buildx use project-v3-builder
191-
- docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --build-arg VERSION=$(VERSION) .
191+
docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --build-arg VERSION=$(VERSION) .
192192
- docker buildx rm project-v3-builder
193193

194194
.PHONY: docker-buildx-openshift
195195
docker-buildx-openshift: ## Build and push docker image for the manager for openshift cross-platform support
196196
- docker buildx create --name project-v3-builder
197197
docker buildx use project-v3-builder
198-
- docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --build-arg VERSION=$(VERSION) --build-arg USER=1001 .
198+
docker buildx build --push --no-cache --provenance=false --platform=$(PLATFORMS) --tag ${IMG} --build-arg VERSION=$(VERSION) --build-arg USER=1001 .
199199
- docker buildx rm project-v3-builder
200200

201201
.PHONY: docker-push
@@ -339,7 +339,7 @@ submodules: ## Pull and update git submodules recursively
339339

340340
# Generate bundle manifests and metadata, then validate generated files.
341341
# For OpenShift bundles run
342-
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.10 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:4.2.0-dev1 make bundle
342+
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.10 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:4.2.0 make bundle
343343
.PHONY: bundle
344344
bundle: manifests kustomize operator-sdk
345345
rm -rf $(ROOT_DIR)/bundle.Dockerfile $(BUNDLE_DIR)
@@ -417,5 +417,5 @@ catalog: opm ## Generate a file-based catalog and its dockerfile.
417417
docker-buildx-catalog: catalog
418418
- docker buildx create --name project-v3-builder
419419
docker buildx use project-v3-builder
420-
- docker buildx build --push --no-cache --platform=$(PLATFORMS) --tag $(CATALOG_IMG) -f $(CATALOG_DIR).Dockerfile .
420+
docker buildx build --push --no-cache --platform=$(PLATFORMS) --tag $(CATALOG_IMG) -f $(CATALOG_DIR).Dockerfile .
421421
- docker buildx rm project-v3-builder

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ are performed by updating an Aerospike cluster Custom Resource (CR).
1010

1111
## Documentation
1212

13-
For full documentation please visit the **[official documentation](https://docs.aerospike.com/cloud/kubernetes/operator).**
13+
For full documentation, please visit the **[official documentation](https://docs.aerospike.com/cloud/kubernetes/operator).**
1414

1515
## What features does it provide?
1616

@@ -44,7 +44,7 @@ Run the following command with the appropriate name and version for the operator
4444

4545
```sh
4646
IMAGE_TAG_BASE=aerospike/aerospike-kubernetes-operator-nightly
47-
VERSION=4.2.0-dev1
47+
VERSION=4.2.0
4848
make docker-buildx IMG=${IMAGE_TAG_BASE}:${VERSION} PLATFORMS=linux/amd64
4949
```
5050
**Note**: Change `PLATFORMS` var as per host machine or remove it to build multi-arch image
@@ -96,7 +96,7 @@ Set up the environment with image names.
9696
```shell
9797
export ACCOUNT=aerospike
9898
export IMAGE_TAG_BASE=${ACCOUNT}/aerospike-kubernetes-operator
99-
export VERSION=4.2.0-dev1
99+
export VERSION=4.2.0
100100
export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION}
101101
export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION}
102102
```

api/v1/aerospikecluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ type AerospikePodStatus struct { //nolint:govet // for readability
12721272

12731273
// AerospikeCluster is the schema for the AerospikeCluster API
12741274
// +operator-sdk:csv:customresourcedefinitions:displayName="Aerospike Cluster",resources={{Service, v1},{Pod,v1},{StatefulSet,v1}}
1275-
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0-dev1"
1275+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0"
12761276
//
12771277
//nolint:lll // for readability
12781278
type AerospikeCluster struct { //nolint:govet // for readability

api/v1/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const (
8585
AerospikeInitContainerNameTagEnvVar = "AEROSPIKE_KUBERNETES_INIT_NAME_TAG"
8686
AerospikeInitContainerDefaultRegistry = "docker.io"
8787
AerospikeInitContainerDefaultRegistryNamespace = "aerospike"
88-
AerospikeInitContainerDefaultNameAndTag = "aerospike-kubernetes-init:2.4.0-dev3"
88+
AerospikeInitContainerDefaultNameAndTag = "aerospike-kubernetes-init:2.4.0"
8989
AerospikeAppLabel = "app"
9090
AerospikeAppLabelValue = "aerospike-cluster"
9191
AerospikeCustomResourceLabel = "aerospike.com/cr"

api/v1beta1/aerospikebackup_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ type AerospikeBackupStatus struct {
8686

8787
// +kubebuilder:object:root=true
8888
// +kubebuilder:subresource:status
89-
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0-dev1"
89+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0"
9090
// +kubebuilder:printcolumn:name="Backup Service Name",type=string,JSONPath=`.spec.backupService.name`
9191
// +kubebuilder:printcolumn:name="Backup Service Namespace",type=string,JSONPath=`.spec.backupService.namespace`
9292
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"

api/v1beta1/aerospikebackupservice_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ type ServiceContainerSpec struct {
161161

162162
// +kubebuilder:object:root=true
163163
// +kubebuilder:subresource:status
164-
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0-dev1"
164+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0"
165165
// +kubebuilder:printcolumn:name="Image",type=string,JSONPath=`.spec.image`
166166
// +kubebuilder:printcolumn:name="Service Type",type=string,JSONPath=`.spec.service.type`
167167
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`

api/v1beta1/aerospikerestore_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ type AerospikeRestoreStatus struct {
8989

9090
// +kubebuilder:object:root=true
9191
// +kubebuilder:subresource:status
92-
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0-dev1"
92+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.2.0"
9393
// +kubebuilder:printcolumn:name="Backup Service Name",type=string,JSONPath=`.spec.backupService.name`
9494
// +kubebuilder:printcolumn:name="Backup Service Namespace",type=string,JSONPath=`.spec.backupService.namespace`
9595
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`

config/crd/bases/asdb.aerospike.com_aerospikebackups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
aerospike-kubernetes-operator/version: 4.2.0-dev1
6+
aerospike-kubernetes-operator/version: 4.2.0
77
controller-gen.kubebuilder.io/version: v0.18.0
88
name: aerospikebackups.asdb.aerospike.com
99
spec:

0 commit comments

Comments
 (0)