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
Merge pull request #159 from darkowlzz/1.4.0-release-prep
Browse files Browse the repository at this point in the history
Operator 1.4.0 release prep
  • Loading branch information
darkowlzz authored Sep 5, 2019
2 parents 1e25295 + 7bb7d24 commit 395e552
Show file tree
Hide file tree
Showing 14 changed files with 1,146 additions and 33 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ metadata-zip:
deploy/olm/storageos/storageoscluster.crd.yaml \
deploy/olm/storageos/storageosjob.crd.yaml \
deploy/olm/storageos/storageosupgrade.crd.yaml \
deploy/olm/storageos/storageosnfsserver.crd.yaml \
deploy/olm/csv-rhel/storageos.v*.clusterserviceversion.yaml

metadata-update:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ 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:1.2.1`
`images.initContainer` | StorageOS init container image | `storageos/init:0.1`
`images.nodeContainer` | StorageOS node container image | `storageos/node:1.4.0`
`images.initContainer` | StorageOS init container image | `storageos/init:1.0.0`
`images.csiNodeDriverRegistrarContainer` | CSI Node Driver Registrar Container image | `quay.io/k8scsi/csi-node-driver-registrar:v1.0.1`
`images.csiClusterDriverRegistrarContainer` | CSI Cluster Driver Registrar Container image | `quay.io/k8scsi/csi-cluster-driver-registrar:v1.0.1`
`images.csiExternalProvisionerContainer` | CSI External Provisioner Container image | `storageos/csi-provisioner:v1.0.1`
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM ${BASE_IMAGE}
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
vendor="StorageOS" \
version="1.3.0" \
version="1.4.0" \
release="1" \
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 @@ -18,7 +18,7 @@ FROM storageos/base-image:0.1.0
LABEL name="StorageOS Cluster Operator" \
maintainer="[email protected]" \
vendor="StorageOS" \
version="1.3.0" \
version="1.4.0" \
release="1" \
distribution-scope="public" \
architecture="x86_64" \
Expand Down
10 changes: 5 additions & 5 deletions deploy/olm/community-changes.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Do not edit this file manually. Use release-gen.sh script to update.
metadata.name: storageosoperator.v1.3.0
metadata.name: storageosoperator.v1.4.0
metadata.namespace: placeholder
metadata.annotations.containerImage: storageos/cluster-operator:1.3.0
spec.version: 1.3.0
spec.install.spec.deployments[0].spec.template.spec.containers[0].image: storageos/cluster-operator:1.3.0
spec.replaces: storageosoperator.v1.2.0
metadata.annotations.containerImage: storageos/cluster-operator:1.4.0
spec.version: 1.4.0
spec.install.spec.deployments[0].spec.template.spec.containers[0].image: storageos/cluster-operator:1.4.0
spec.replaces: storageosoperator.v1.3.0
33 changes: 26 additions & 7 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.v1.3.0
name: storageosoperator.v1.4.0
namespace: placeholder
annotations:
capabilities: Full Lifecycle
categories: Storage
description: Cloud-native, persistent storage for containers.
containerImage: registry.connect.redhat.com/storageos/cluster-operator:1.3.0
containerImage: registry.connect.redhat.com/storageos/cluster-operator:1.4.0
repository: https://github.com/storageos/cluster-operator
createdAt: "2019-07-08T12:01:29Z"
createdAt: "2019-09-04T17:21:53Z"
support: StorageOS, Inc
certified: "true"
alm-examples: |-
Expand All @@ -24,7 +24,11 @@ metadata:
"spec": {
"namespace": "kube-system",
"secretRefName": "storageos-api",
"secretRefNamespace": "default"
"secretRefNamespace": "default",
"csi": {
"enable": true,
"deploymentStrategy": "deployment"
}
}
},
{
Expand Down Expand Up @@ -52,6 +56,21 @@ metadata:
"spec": {
"newImage": "registry.connect.redhat.com/storageos/node:latest"
}
},
{
"apiVersion": "storageos.com/v1",
"kind": "NFSServer",
"metadata": {
"name": "example-nfsserver",
"namespace": "default"
},
"spec": {
"resources": {
"requests": {
"storage": "1Gi"
}
}
}
}
]
spec:
Expand Down Expand Up @@ -142,7 +161,7 @@ spec:
- storage
- persistent storage
- open source
version: 1.3.0
version: 1.4.0
minKubeVersion: 1.10.0
maturity: stable
maintainers:
Expand Down Expand Up @@ -315,7 +334,7 @@ spec:
- name: storageos-operator
command:
- cluster-operator
image: registry.connect.redhat.com/storageos/cluster-operator:1.3.0
image: registry.connect.redhat.com/storageos/cluster-operator:1.4.0
env:
- name: WATCH_NAMESPACE
valueFrom:
Expand Down Expand Up @@ -515,4 +534,4 @@ spec:
- description: The container image of the NFS server.
displayName: Image
path: nfsContainer
replaces: storageosoperator.v1.2.0
replaces: storageosoperator.v1.3.0
Loading

0 comments on commit 395e552

Please sign in to comment.