Skip to content

Commit 58d283e

Browse files
abhishekdwivedi3060abhishekdwivedi3060
authored
Update AKO version 4.0.0 and k8s version (#342)
* Update AKO version 4.0.0 and k8s version * Update init tag to 2.2.4 * Update openshift version to 4.10
1 parent 45324e9 commit 58d283e

34 files changed

+50
-50
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="3.4.1"
30+
ARG VERSION="4.0.0"
3131

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

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pipeline {
2424

2525
AEROSPIKE_CUSTOM_INIT_REGISTRY="568976754000.dkr.ecr.ap-south-1.amazonaws.com"
2626
AEROSPIKE_CUSTOM_INIT_REGISTRY_NAMESPACE="aerospike"
27-
AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.2.4-dev1"
27+
AEROSPIKE_CUSTOM_INIT_NAME_TAG="aerospike-kubernetes-init:2.2.4"
2828
}
2929

3030
stages {
@@ -119,7 +119,7 @@ boolean isNightly() {
119119
}
120120

121121
String getVersion() {
122-
def prefix = "3.4.1"
122+
def prefix = "4.0.0"
123123
def candidateName = ""
124124
if(isNightly()) {
125125
def timestamp = new Date().format("yyyy-MM-dd")

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
ROOT_DIR=$(shell git rev-parse --show-toplevel)
55
# Openshift platform supported version
6-
OPENSHIFT_VERSION="v4.9"
6+
OPENSHIFT_VERSION="v4.10"
77

88
# VERSION defines the project version for the bundle.
99
# Update this value when you upgrade the version of your project.
1010
# To re-generate a bundle for another specific version without changing the standard setup, you can:
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 ?= 3.4.1
14+
VERSION ?= 4.0.0
1515

1616
# Platforms supported
1717
PLATFORMS ?= linux/amd64,linux/arm64
@@ -315,7 +315,7 @@ submodules: ## Pull and update git submodules recursively
315315

316316
# Generate bundle manifests and metadata, then validate generated files.
317317
# For OpenShift bundles run
318-
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:3.4.1 make bundle
318+
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.10 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:4.0.0 make bundle
319319
.PHONY: bundle
320320
bundle: manifests kustomize operator-sdk
321321
rm -rf $(ROOT_DIR)/bundle.Dockerfile $(BUNDLE_DIR)

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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=3.4.1
47+
VERSION=4.0.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
@@ -84,8 +84,8 @@ operator using OLM.
8484

8585
### Install operator-sdk
8686

87-
Install operator-sdk version 1.36.0 using the
88-
installation [guide](https://v1-36-x.sdk.operatorframework.io/docs/installation/)
87+
Install operator-sdk version 1.39.1 using the
88+
installation [guide](https://v1-39-x.sdk.operatorframework.io/docs/installation/)
8989

9090
### Build the bundle
9191

@@ -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=3.4.1
99+
export VERSION=4.0.0
100100
export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION}
101101
export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION}
102102
export CATALOG_IMG=docker.io/${IMAGE_TAG_BASE}-catalog-nightly:${VERSION}
@@ -221,7 +221,7 @@ operator-sdk cleanup aerospike-kubernetes-operator --namespace=aerospike
221221

222222
### Running tests
223223

224-
The operator tests require following prerequisites
224+
The operator tests require the following prerequisites
225225

226226
- A running Kubernetes cluster with at least 3 nodes with at least 12 CPUs
227227
- A storage class named "ssd" that allows provisioning of filesystem and block devices

‎api/v1/aerospikecluster_types.go‎

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

11681168
// AerospikeCluster is the schema for the AerospikeCluster API
11691169
// +operator-sdk:csv:customresourcedefinitions:displayName="Aerospike Cluster",resources={{Service, v1},{Pod,v1},{StatefulSet,v1}}
1170-
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.4.1"
1170+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.0"
11711171
//
11721172
//nolint:lll // for readability
11731173
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
@@ -74,7 +74,7 @@ const (
7474
AerospikeInitContainerNameTagEnvVar = "AEROSPIKE_KUBERNETES_INIT_NAME_TAG"
7575
AerospikeInitContainerDefaultRegistry = "docker.io"
7676
AerospikeInitContainerDefaultRegistryNamespace = "aerospike"
77-
AerospikeInitContainerDefaultNameAndTag = "aerospike-kubernetes-init:2.2.4-dev1"
77+
AerospikeInitContainerDefaultNameAndTag = "aerospike-kubernetes-init:2.2.4"
7878
AerospikeAppLabel = "app"
7979
AerospikeAppLabelValue = "aerospike-cluster"
8080
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=3.4.1"
89+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.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=3.4.1"
164+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.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=3.4.1"
92+
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=4.0.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: 3.4.1
6+
aerospike-kubernetes-operator/version: 4.0.0
77
controller-gen.kubebuilder.io/version: v0.16.1
88
name: aerospikebackups.asdb.aerospike.com
99
spec:

0 commit comments

Comments
 (0)