From 03662f33411552f1d03f576901ecf3b2dd3171f7 Mon Sep 17 00:00:00 2001 From: Tanmay Jain <103629776+tanmayja@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:39:02 +0530 Subject: [PATCH] security vulnerabilities 3.3.1 release (#297) --- Dockerfile | 2 +- Jenkinsfile | 2 +- Makefile | 4 ++-- README.md | 4 ++-- api/v1/aerospikecluster_types.go | 2 +- api/v1/utils.go | 2 +- config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml | 2 +- config/manager/kustomization.yaml | 2 +- helm-charts/aerospike-cluster/Chart.yaml | 4 ++-- helm-charts/aerospike-kubernetes-operator/Chart.yaml | 4 ++-- helm-charts/aerospike-kubernetes-operator/README.md | 2 +- ...sourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml | 2 +- helm-charts/aerospike-kubernetes-operator/values.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ad06900d..46cff61df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.3.0" +ARG VERSION="3.3.1" # User to run container as ARG USER="root" diff --git a/Jenkinsfile b/Jenkinsfile index ce22b6f60..95b2201b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -119,7 +119,7 @@ boolean isNightly() { } String getVersion() { - def prefix = "3.3.0" + def prefix = "3.3.1" def candidateName = "" if(isNightly()) { def timestamp = new Date().format("yyyy-MM-dd") diff --git a/Makefile b/Makefile index 7bd70b4d9..d4181b9f5 100644 --- a/Makefile +++ b/Makefile @@ -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.3.0 +VERSION ?= 3.3.1 # Platforms supported PLATFORMS ?= linux/amd64,linux/arm64 @@ -254,7 +254,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.3.0 make bundle +# CHANNELS=stable DEFAULT_CHANNEL=stable OPENSHIFT_VERSION=v4.6 IMG=docker.io/aerospike/aerospike-kubernetes-operator-nightly:3.3.1 make bundle .PHONY: bundle bundle: manifests kustomize rm -rf $(ROOT_DIR)/bundle.Dockerfile $(BUNDLE_DIR) diff --git a/README.md b/README.md index 5a693532e..5eeffa18d 100644 --- a/README.md +++ b/README.md @@ -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.3.0 +VERSION=3.3.1 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 @@ -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.3.0 +export VERSION=3.3.1 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} diff --git a/api/v1/aerospikecluster_types.go b/api/v1/aerospikecluster_types.go index b6273d078..bcee242a2 100644 --- a/api/v1/aerospikecluster_types.go +++ b/api/v1/aerospikecluster_types.go @@ -924,7 +924,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.3.0" +// +kubebuilder:metadata:annotations="aerospike-kubernetes-operator/version=3.3.1" // //nolint:lll // for readability type AerospikeCluster struct { //nolint:govet // for readability diff --git a/api/v1/utils.go b/api/v1/utils.go index fd08bd7ca..833b67b0a 100644 --- a/api/v1/utils.go +++ b/api/v1/utils.go @@ -71,7 +71,7 @@ const ( AerospikeInitContainerRegistryEnvVar = "AEROSPIKE_KUBERNETES_INIT_REGISTRY" AerospikeInitContainerDefaultRegistry = "docker.io" AerospikeInitContainerDefaultRegistryNamespace = "aerospike" - AerospikeInitContainerDefaultRepoAndTag = "aerospike-kubernetes-init:2.2.0" + AerospikeInitContainerDefaultRepoAndTag = "aerospike-kubernetes-init:2.2.1" AerospikeAppLabel = "app" AerospikeAppLabelValue = "aerospike-cluster" AerospikeCustomResourceLabel = "aerospike.com/cr" diff --git a/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml b/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml index 30b572767..1984ff2b2 100644 --- a/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml +++ b/config/crd/bases/asdb.aerospike.com_aerospikeclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - aerospike-kubernetes-operator/version: 3.3.0 + aerospike-kubernetes-operator/version: 3.3.1 controller-gen.kubebuilder.io/version: v0.12.1 name: aerospikeclusters.asdb.aerospike.com spec: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index fd8e34efe..21e9a7b5b 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -14,4 +14,4 @@ configMapGenerator: images: - name: controller newName: docker.io/aerospike/aerospike-kubernetes-operator-nightly - newTag: 3.3.0 + newTag: 3.3.1 diff --git a/helm-charts/aerospike-cluster/Chart.yaml b/helm-charts/aerospike-cluster/Chart.yaml index 14ba32610..8a5aef52a 100644 --- a/helm-charts/aerospike-cluster/Chart.yaml +++ b/helm-charts/aerospike-cluster/Chart.yaml @@ -3,9 +3,9 @@ type: application name: aerospike-cluster # version tracks chart changes -version: 3.3.0 +version: 3.3.1 # appVersion tracks operator version -appVersion: 3.3.0 +appVersion: 3.3.1 description: A Helm chart for Aerospike Cluster Custom Resource icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 diff --git a/helm-charts/aerospike-kubernetes-operator/Chart.yaml b/helm-charts/aerospike-kubernetes-operator/Chart.yaml index 1e512b82c..83124a87f 100644 --- a/helm-charts/aerospike-kubernetes-operator/Chart.yaml +++ b/helm-charts/aerospike-kubernetes-operator/Chart.yaml @@ -3,9 +3,9 @@ type: application name: aerospike-kubernetes-operator # version tracks chart changes -version: 3.3.0 +version: 3.3.1 # appVersion tracks operator version -appVersion: 3.3.0 +appVersion: 3.3.1 description: A Helm chart for Aerospike Kubernetes Operator icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4 diff --git a/helm-charts/aerospike-kubernetes-operator/README.md b/helm-charts/aerospike-kubernetes-operator/README.md index f148110bd..4b13f8dc9 100644 --- a/helm-charts/aerospike-kubernetes-operator/README.md +++ b/helm-charts/aerospike-kubernetes-operator/README.md @@ -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.3.0` | +| `operatorImage.tag` | Operator image tag | `3.3.1` | | `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` | diff --git a/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml b/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml index 30b572767..1984ff2b2 100644 --- a/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml +++ b/helm-charts/aerospike-kubernetes-operator/crds/customresourcedefinition_aerospikeclusters.asdb.aerospike.com.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - aerospike-kubernetes-operator/version: 3.3.0 + aerospike-kubernetes-operator/version: 3.3.1 controller-gen.kubebuilder.io/version: v0.12.1 name: aerospikeclusters.asdb.aerospike.com spec: diff --git a/helm-charts/aerospike-kubernetes-operator/values.yaml b/helm-charts/aerospike-kubernetes-operator/values.yaml index 3bca6fac6..3befb4221 100644 --- a/helm-charts/aerospike-kubernetes-operator/values.yaml +++ b/helm-charts/aerospike-kubernetes-operator/values.yaml @@ -4,7 +4,7 @@ replicas: 2 ## Operator image operatorImage: repository: aerospike/aerospike-kubernetes-operator - tag: 3.3.0 + tag: 3.3.1 pullPolicy: IfNotPresent ## In case the above image is pulled from a registry that requires