Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit

Permalink
Prep for v2.4.2 (#343)
Browse files Browse the repository at this point in the history
* Prep for v2.4.2

* Revert formatting changes
  • Loading branch information
croomes authored Jul 13, 2021
1 parent cb08df3 commit 165afca
Show file tree
Hide file tree
Showing 15 changed files with 1,373 additions and 40 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ OPERATOR_NAME = storageosoperator
BUNDLE_DIR = $(PWD)/bundle
# Current bundle version is the next release version.
# Bundle generation requires the current version number of the operator.
CURRENT_BUNDLE_VERSION = "2.4.1"
CURRENT_BUNDLE_VERSION = "2.4.2"
SERVICE_ACCOUNT_NAME = $(shell $(YQ3) r deploy/operator.yaml spec.template.spec.serviceAccountName)
SERVICE_ACCOUNT_PATH = "spec.install.spec.clusterPermissions[0].serviceAccountName"
CSV_FILE = "bundle/manifests/storageosoperator.clusterserviceversion.yaml"

# Set the new version before running the release target.
NEW_VERSION ?= v2.4.1
NEW_VERSION ?= v2.4.2

# Variables to be used when running the make targets in a container.
CACHE_DIR = $(shell pwd)/.cache
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Parameter | Description | Default
`secretRefName` | Reference name of storageos secret |
`secretRefNamespace` | Namespace of storageos secret |
`namespace` | Namespace where storageos cluster resources are created | `storageos`
`images.nodeContainer` | StorageOS node container image | `storageos/node:v2.4.1`
`images.nodeContainer` | StorageOS node container image | `storageos/node:v2.4.2`
`images.initContainer` | StorageOS init container image | `storageos/init:v2.1.0`
`images.apiManagerContainer` | StorageOS API Manager container image | `storageos/api-manager:v1.1.2`
`images.csiNodeDriverRegistrarContainer` | CSI Node Driver Registrar Container image | Varies depending on Kubernetes version
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM ${BASE_IMAGE}
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
vendor="StorageOS" \
version="v2.4.1" \
version="v2.4.2" \
release="2" \
distribution-scope="public" \
architecture="x86_64" \
Expand Down
2 changes: 1 addition & 1 deletion build/rhel-build-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
vendor="StorageOS" \
version="v2.4.1" \
version="v2.4.2" \
release="2" \
distribution-scope="public" \
architecture="x86_64" \
Expand Down
13 changes: 4 additions & 9 deletions bundle/manifests/storageosoperator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metadata:
]
repository: https://github.com/storageos/cluster-operator
support: StorageOS, Inc
name: storageosoperator.v2.4.1
name: storageosoperator.v2.4.2
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -274,9 +274,9 @@ spec:
* **Delta Sync** - replicas out of sync due to transient failures only transfer changed blocks.
* **Multiple AccessModes** - dynamically provision ReadWriteOnce or ReadWriteMany volumes.
* **Rapid Failover** - quickly detects node failure and automates recovery actions without administrator intervention.
* **Data Encryption** - both in transit and at rest.
* **Scalability** - disaggregated consensus means no single scheduling point of failure.
Expand Down Expand Up @@ -533,11 +533,6 @@ spec:
name: operatormetrics
resources: {}
serviceAccountName: storageoscluster-operator-sa
tolerations:
- effect: NoSchedule
key: key
operator: Equal
value: value
strategy: deployment
installModes:
- supported: true
Expand Down Expand Up @@ -570,4 +565,4 @@ spec:
selector:
matchLabels:
operated-by: storageosoperator
version: 2.4.1
version: 2.4.2
10 changes: 5 additions & 5 deletions deploy/olm/community-changes.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Do not edit this file manually. Use release-gen.sh script to update.
metadata.name: storageosoperator.v2.4.1
metadata.name: storageosoperator.v2.4.2
metadata.namespace: placeholder
metadata.annotations.containerImage: storageos/cluster-operator:v2.4.1
spec.version: 2.4.1
spec.install.spec.deployments[0].spec.template.spec.containers[0].image: storageos/cluster-operator:v2.4.1
metadata.annotations.containerImage: storageos/cluster-operator:v2.4.2
spec.version: 2.4.2
spec.install.spec.deployments[0].spec.template.spec.containers[0].image: storageos/cluster-operator:v2.4.2
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[0].value: ""
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[1].value: ""
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[2].value: ""
Expand All @@ -17,4 +17,4 @@ spec.install.spec.deployments[0].spec.template.spec.containers[0].env[9].value:
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[10].value: ""
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[11].value: ""
spec.install.spec.deployments[0].spec.template.spec.containers[0].env[12].value: ""
spec.replaces: storageosoperator.v2.4.0
spec.replaces: storageosoperator.v2.4.1
12 changes: 6 additions & 6 deletions deploy/olm/csv-rhel/storageos.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
name: storageosoperator.v2.4.1
name: storageosoperator.v2.4.2
namespace: placeholder
annotations:
capabilities: Deep Insights
categories: Storage
description: Cloud-native, persistent storage for containers.
containerImage: registry.connect.redhat.com/storageos/cluster-operator:v2.4.1
containerImage: registry.connect.redhat.com/storageos/cluster-operator:v2.4.2
repository: https://github.com/storageos/cluster-operator
createdAt: "2021-07-01T13:22:35Z"
createdAt: "2021-07-12T10:34:28Z"
support: StorageOS, Inc
certified: "true"
operators.operatorframework.io/internal-objects: |-
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
- storage
- persistent storage
- open source
version: 2.4.1
version: 2.4.2
minKubeVersion: 1.13.0
maturity: stable
maintainers:
Expand Down Expand Up @@ -383,7 +383,7 @@ spec:
- name: storageos-operator
command:
- cluster-operator
image: registry.connect.redhat.com/storageos/cluster-operator:v2.4.1
image: registry.connect.redhat.com/storageos/cluster-operator:v2.4.2
env:
- name: RELATED_IMAGE_STORAGEOS_NODE
value: ""
Expand Down Expand Up @@ -722,4 +722,4 @@ spec:
with the NFS Server. If not specified, a new PVC is provisioned and used.
displayName: Persistent Volume Claim
path: persistentVolumeClaim
replaces: storageosoperator.v2.4.0
replaces: storageosoperator.v2.4.1
Loading

0 comments on commit 165afca

Please sign in to comment.