Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding 3.2.2 release change in master branch #278

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Adding 3.2.2 release change in master branch #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e5a0e
Adding 3.2.2 release change in master branch
tanmayja Mar 18, 2024
2c2beb9
updating management lib to v1.2.1
tanmayja Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} GO111MODULE=on go
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

# Version of Operator (build arg)
ARG VERSION="3.2.1"
ARG VERSION="3.2.2"

# User to run container as
ARG USER="root"
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ boolean isNightly() {
}

String getVersion() {
def prefix = "3.2.1"
def prefix = "3.2.2"
def candidateName = ""
if(isNightly()) {
def timestamp = new Date().format("yyyy-MM-dd")
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ OPENSHIFT_VERSION="v4.9"
# - 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)
# TODO: Version must be pulled from git tags
VERSION ?= 3.2.1
VERSION ?= 3.2.2

# Platforms supported
PLATFORMS ?= linux/amd64,linux/arm64
Expand Down Expand Up @@ -255,7 +255,7 @@ submodules: ## Pull and update git submodules recursively

# Generate bundle manifests and metadata, then validate generated files.
# For OpenShift bundles run
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:3.2.1 make bundle
# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:3.2.2 make bundle
.PHONY: bundle
bundle: manifests kustomize
rm -rf $(ROOT_DIR)/bundle.Dockerfile $(BUNDLE_DIR)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Run the following command with the appropriate name and version for the operator

```sh
IMAGE_TAG_BASE=aerospike/aerospike-kubernetes-operator-nightly
VERSION=3.2.1
VERSION=3.2.2
make docker-buildx IMG=${IMAGE_TAG_BASE}:${VERSION} PLATFORMS=linux/amd64
```
**Note**: Change `PLATFORMS` var as per host machine or remove it to build multi-arch image
Expand Down Expand Up @@ -94,7 +94,7 @@ Set up the environment with image names.
```shell
export ACCOUNT=aerospike
export IMAGE_TAG_BASE=${ACCOUNT}/aerospike-kubernetes-operator
export VERSION=3.2.1
export VERSION=3.2.2
export IMG=docker.io/${IMAGE_TAG_BASE}-nightly:${VERSION}
export BUNDLE_IMG=docker.io/${IMAGE_TAG_BASE}-bundle-nightly:${VERSION}
export CATALOG_IMG=docker.io/${IMAGE_TAG_BASE}-catalog-nightly:${VERSION}
Expand Down
2 changes: 1 addition & 1 deletion api/v1/aerospikecluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ type AerospikePodStatus struct { //nolint:govet // for readability

// AerospikeCluster is the schema for the AerospikeCluster API
// +operator-sdk:csv:customresourcedefinitions:displayName="Aerospike Cluster",resources={{Service, v1},{Pod,v1},{StatefulSet,v1}}
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.2.1"
// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.2.2"
//
//nolint:lll // for readability
type AerospikeCluster struct { //nolint:govet // for readability
Expand Down
2 changes: 1 addition & 1 deletion api/v1/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const (
AerospikeInitContainerRegistryEnvVar = "AEROSPIKE_KUBERNETES_INIT_REGISTRY"
AerospikeInitContainerDefaultRegistry = "docker.io"
AerospikeInitContainerDefaultRegistryNamespace = "aerospike"
AerospikeInitContainerDefaultRepoAndTag = "aerospike-kubernetes-init:2.1.1"
AerospikeInitContainerDefaultRepoAndTag = "aerospike-kubernetes-init:2.1.2"
AerospikeAppLabel = "app"
AerospikeCustomResourceLabel = "aerospike.com/cr"
AerospikeRackIDLabel = "aerospike.com/rack-id"
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
aerospike-kubernetes-operator/version: 3.2.1
aerospike-kubernetes-operator/version: 3.2.2
controller-gen.kubebuilder.io/version: v0.12.1
name: aerospikeclusters.asdb.aerospike.com
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
args:
- "--secure-listen-address=0.0.0.0:8443"
- "--upstream=http://127.0.0.1:8080/"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ configMapGenerator:
images:
- name: controller
newName: docker.io/aerospike/aerospike-kubernetes-operator-nightly
newTag: 3.2.1
newTag: 3.2.2
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.21.8

require (
github.com/aerospike/aerospike-client-go/v6 v6.14.0
github.com/aerospike/aerospike-management-lib v1.2.0
github.com/aerospike/aerospike-management-lib v1.2.1
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/go-logr/logr v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/aerospike/aerospike-client-go/v6 v6.14.0 h1:Z3FcGWJda1sagzdc6Akz4EJ13Pq55Uyn6qtFLrVUDd0=
github.com/aerospike/aerospike-client-go/v6 v6.14.0/go.mod h1:/0Wm81GhMqem+9flWcpazPKoRfjFeG6WrQdXGiMNi0A=
github.com/aerospike/aerospike-management-lib v1.2.0 h1:aBs6ZTJeVAlWZGUyxAwEBorqQG2aqQh4Ut3yxpQlV9k=
github.com/aerospike/aerospike-management-lib v1.2.0/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
github.com/aerospike/aerospike-management-lib v1.2.1 h1:VgKJzQ/zcyqGMhivvSuqmGIFtByHavtVPGX7ZUE+gQI=
github.com/aerospike/aerospike-management-lib v1.2.1/go.mod h1:EtWBVE/1TlphicTvpchAjpAgjoFXddvZAXXyrvqWKu0=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-cluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ type: application
name: aerospike-cluster

# version tracks chart changes
version: 3.2.1
version: 3.2.2
# appVersion tracks operator version
appVersion: 3.2.1
appVersion: 3.2.2

description: A Helm chart for Aerospike Cluster Custom Resource
icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-kubernetes-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ type: application
name: aerospike-kubernetes-operator

# version tracks chart changes
version: 3.2.1
version: 3.2.2
# appVersion tracks operator version
appVersion: 3.2.1
appVersion: 3.2.2

description: A Helm chart for Aerospike Kubernetes Operator
icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-kubernetes-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ helm install aerospike-kubernetes-operator ./aerospike-kubernetes-operator --set
|-------------------------------------|-------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
| `replicas` | Number of operator replicas | `2` |
| `operatorImage.repository` | Operator image repository | `aerospike/aerospike-kubernetes-operator` |
| `operatorImage.tag` | Operator image tag | `3.2.1` |
| `operatorImage.tag` | Operator image tag | `3.2.2` |
| `operatorImage.pullPolicy` | Image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Secrets containing credentials to pull Operator image from a private registry | `{}` (nil) |
| `rbac.create` | Set this to `true` to let helm chart automatically create RBAC resources necessary for operator | `true` |
Expand Down Expand Up @@ -71,7 +71,7 @@ helm install aerospike-kubernetes-operator ./aerospike-kubernetes-operator --set
| `livenessProbe` | Liveliness probe for operator container | `initialDelaySeconds: 15`, `periodSeconds: 20`, `timeoutSeconds: 1`, `successThreshold: 1`, `failureThreshold: 3` |
| `readinessProbe` | Readiness probe for the operator container | `initialDelaySeconds: 5`, `periodSeconds: 10`, `timeoutSeconds: 1`, `successThreshold: 1`, `failureThreshold: 3` |
| `kubeRBACProxy.image.repository` | Kube RBAC Proxy image repository container | `gcr.io/kubebuilder/kube-rbac-proxy` |
| `kubeRBACProxy.image.tag` | Kube RBAC Proxy image tag | `v0.13.1` |
| `kubeRBACProxy.image.tag` | Kube RBAC Proxy image tag | `v0.15.0` |
| `kubeRBACProxy.image.pullPolicy` | Kube RBAC Proxy image pull policy | `IfNotPresent` |
| `kubeRBACProxy.port` | Kube RBAC proxy listening port | `8443` |
| `kubeRBACProxy.resources` | Kube RBAC Proxy container resource | `{}` (nil) |
Expand Down
2 changes: 1 addition & 1 deletion ...bernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
aerospike-kubernetes-operator/version: 3.2.1
aerospike-kubernetes-operator/version: 3.2.2
controller-gen.kubebuilder.io/version: v0.12.1
name: aerospikeclusters.asdb.aerospike.com
spec:
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-kubernetes-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replicas: 2
## Operator image
operatorImage:
repository: aerospike/aerospike-kubernetes-operator
tag: 3.2.1
tag: 3.2.2
pullPolicy: IfNotPresent

## In case the above image is pulled from a registry that requires
Expand Down Expand Up @@ -109,7 +109,7 @@ readinessProbe:
kubeRBACProxy:
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.13.1
tag: v0.15.0
pullPolicy: IfNotPresent
port: 8443
resources:
Expand Down
Loading