Skip to content

Commit

Permalink
Bump the version to 1.11.0 (#2453)
Browse files Browse the repository at this point in the history
Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
  • Loading branch information
nunnatsa authored Aug 1, 2023
1 parent 6a28b65 commit f7496a0
Show file tree
Hide file tree
Showing 30 changed files with 29,134 additions and 70 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ For more explanation and advanced options for HCO deployment using kustomize, re

Hyperconverged Cluster Operator is publishing the latest bundle to [quay.io/kubevirt](https://quay.io/repository/kubevirt)
before publishing tagged, stable releases to [OperatorHub.io](https://operatorhub.io).
The latest bundle is `quay.io/kubevirt/hyperconverged-cluster-bundle:1.10.0-unstable`. It is built and pushed on every merge to
The latest bundle is `quay.io/kubevirt/hyperconverged-cluster-bundle:1.11.0-unstable`. It is built and pushed on every merge to
main branch, and contains the most up-to-date manifests, which are pointing to the most recent application images: `hyperconverged-cluster-operator`
and `hyperconverged-cluster-webhook`, which are built together with the bundle from the current code at the main branch.
The unreleased bundle can be consumed on a cluster by creating a CatalogSource pointing to the index image that contains
that bundle: `quay.io/kubevirt/hyperconverged-cluster-index:1.10.0-unstable`.
that bundle: `quay.io/kubevirt/hyperconverged-cluster-index:1.11.0-unstable`.

Make the bundle available in the cluster's packagemanifest by adding the following CatalogSource:
```bash
Expand All @@ -53,7 +53,7 @@ metadata:
namespace: openshift-marketplace
spec:
sourceType: grpc
image: quay.io/kubevirt/hyperconverged-cluster-index:1.10.0-unstable
image: quay.io/kubevirt/hyperconverged-cluster-index:1.11.0-unstable
displayName: Kubevirt Hyperconverged Cluster Operator
publisher: Kubevirt Project
EOF
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
source: hco-unstable-catalog-source
sourceNamespace: openshift-marketplace
name: community-kubevirt-hyperconverged
channel: "1.10.0"
channel: "1.11.0"
EOF
```
Then, create the HyperConverged custom resource to complete the installation.
Expand Down Expand Up @@ -160,7 +160,7 @@ metadata:
name: hco-subscription
namespace: kubevirt-hyperconverged
spec:
channel: "1.10.0"
channel: "1.11.0"
name: community-kubevirt-hyperconverged
source: hco-catalogsource
sourceNamespace: openshift-marketplace
Expand Down
2 changes: 1 addition & 1 deletion assets/upgradePatches.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
}
},
{
"semverRange": "<=1.10.0",
"semverRange": "<=1.11.0",
"groupVersionKind": {
"group": "apiextensions.k8s.io",
"version": "v1",
Expand Down
6 changes: 3 additions & 3 deletions controllers/hyperconverged/hyperconverged_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1250,9 +1250,9 @@ var _ = Describe("HyperconvergedController", func() {
Context("Upgrade Mode", func() {
const (
oldVersion = "1.6.1" // to be sure to cover v2v CRDs removal during upgrades
newVersion = "1.10.0" // TODO: avoid hard-coding values
oldComponentVersion = "1.10.0"
newComponentVersion = "1.10.3"
newVersion = "1.11.0" // TODO: avoid hard-coding values
oldComponentVersion = "1.11.0"
newComponentVersion = "1.11.3"
)

// this is used for version label and the tests below
Expand Down
4 changes: 2 additions & 2 deletions deploy/index-image/Dockerfile.bundle.ci-index-image-upgrade
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/fedora/fedora:37-x86_64 AS builder
ARG INITIAL_VERSION=1.10.0
ARG INITIAL_VERSION_SED="1\.10\.0"
ARG INITIAL_VERSION=1.11.0
ARG INITIAL_VERSION_SED="1\.11\.0"
ARG TARGET_VERSION=100.0.0
ARG PACKAGE_NAME=community-kubevirt-hyperconverged
ARG CSV_FILE=/manifests/kubevirt-hyperconverged-operator.v${TARGET_VERSION}.clusterserviceversion.yaml
Expand Down
2 changes: 1 addition & 1 deletion deploy/index-image/bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM scratch

ARG VERSION=1.10.0
ARG VERSION=1.11.0

LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/os.linux: supported
name: kubevirt-hyperconverged-operator.v1.10.0
name: kubevirt-hyperconverged-operator.v1.11.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -2774,7 +2774,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-operator
name: hco-operator
spec:
Expand All @@ -2790,7 +2790,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-operator
spec:
containers:
Expand Down Expand Up @@ -2822,7 +2822,7 @@ spec:
Product: None
- name: MACHINETYPE
- name: HCO_KV_IO_VERSION
value: 1.10.0
value: 1.11.0
- name: KUBEVIRT_VERSION
value: v1.0.0
- name: CDI_VERSION
Expand Down Expand Up @@ -2875,7 +2875,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-webhook
name: hco-webhook
spec:
Expand All @@ -2891,7 +2891,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-webhook
spec:
containers:
Expand Down Expand Up @@ -2951,7 +2951,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-cli-download
name: hyperconverged-cluster-cli-download
spec:
Expand All @@ -2967,7 +2967,7 @@ spec:
app.kubernetes.io/component: deployment
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hyperconverged-cluster-cli-download
spec:
containers:
Expand Down Expand Up @@ -2995,7 +2995,7 @@ spec:
app.kubernetes.io/component: network
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: cluster-network-addons-operator
spec:
replicas: 1
Expand All @@ -3014,7 +3014,7 @@ spec:
app.kubernetes.io/component: network
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: cluster-network-addons-operator
prometheus.cnao.io: "true"
spec:
Expand Down Expand Up @@ -3108,7 +3108,7 @@ spec:
app.kubernetes.io/component: compute
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: virt-operator
spec:
replicas: 2
Expand All @@ -3123,7 +3123,7 @@ spec:
app.kubernetes.io/component: compute
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
kubevirt.io: virt-operator
name: virt-operator
prometheus.kubevirt.io: "true"
Expand Down Expand Up @@ -3228,7 +3228,7 @@ spec:
app.kubernetes.io/component: schedule
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
control-plane: ssp-operator
name: ssp-operator
name: ssp-operator
Expand All @@ -3246,7 +3246,7 @@ spec:
app.kubernetes.io/component: schedule
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
control-plane: ssp-operator
name: ssp-operator
prometheus.ssp.kubevirt.io: "true"
Expand Down Expand Up @@ -3305,7 +3305,7 @@ spec:
app.kubernetes.io/component: storage
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: cdi-operator
spec:
replicas: 1
Expand All @@ -3320,7 +3320,7 @@ spec:
app.kubernetes.io/component: storage
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: cdi-operator
operator.cdi.kubevirt.io: ""
prometheus.cdi.kubevirt.io: "true"
Expand Down Expand Up @@ -3380,7 +3380,7 @@ spec:
app.kubernetes.io/component: storage
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hostpath-provisioner-operator
spec:
replicas: 1
Expand All @@ -3395,7 +3395,7 @@ spec:
app.kubernetes.io/component: storage
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.10.0
app.kubernetes.io/version: 1.11.0
name: hostpath-provisioner-operator
operator.hostpath-provisioner.kubevirt.io: ""
prometheus.hostpathprovisioner.kubevirt.io: "true"
Expand Down Expand Up @@ -3979,12 +3979,12 @@ spec:
name: virt-operator
- image: quay.io/kubevirt/virtio-container-disk@sha256:f8e71a3a930ce95d646d80862d5ff6f9d3ed7ef2541dd2e2acec0bce26274734
name: virtio-container-disk
replaces: kubevirt-hyperconverged-operator.v1.9.0
replaces: kubevirt-hyperconverged-operator.v1.10.0
selector:
matchLabels:
alm-owner-kubevirt: kubevirt-hyperconverged
operated-by: kubevirt-hyperconverged
version: 1.10.0
version: 1.11.0
webhookdefinitions:
- admissionReviewVersions:
- v1beta1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
annotations:
operators.operatorframework.io.bundle.channel.default.v1: 1.10.0
operators.operatorframework.io.bundle.channels.v1: 1.10.0
operators.operatorframework.io.bundle.channel.default.v1: 1.11.0
operators.operatorframework.io.bundle.channels.v1: 1.11.0
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
operators.operatorframework.io.bundle.metadata.v1: metadata/
Expand Down
4 changes: 2 additions & 2 deletions deploy/kustomize/base/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ spec:
source: kubevirt-hyperconverged
sourceNamespace: openshift-marketplace
name: community-kubevirt-hyperconverged
#startingCSV: kubevirt-hyperconverged-operator.v1.10.0
channel: "1.10.0"
#startingCSV: kubevirt-hyperconverged-operator.v1.11.0
channel: "1.11.0"
4 changes: 2 additions & 2 deletions deploy/kustomize/deploy_kustomize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -x

# Setup Environment Variables
HCO_VERSION="${HCO_VERSION:-}"
HCO_CHANNEL="${HCO_CHANNEL:-1.10.0}"
HCO_INDEX_IMAGE="${HCO_INDEX_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-index:1.10.0-unstable}"
HCO_CHANNEL="${HCO_CHANNEL:-1.11.0}"
HCO_INDEX_IMAGE="${HCO_INDEX_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-index:1.11.0-unstable}"
MARKETPLACE_MODE="${MARKETPLACE_MODE:-true}"
PRIVATE_REPO="${PRIVATE_REPO:-false}"
QUAY_USERNAME="${QUAY_USERNAME:-}"
Expand Down
2 changes: 1 addition & 1 deletion deploy/kustomize/image_registry/catalog_source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
namespace: openshift-marketplace
spec:
sourceType: grpc
image: quay.io/kubevirt/hyperconverged-cluster-index:1.10.0-unstable
image: quay.io/kubevirt/hyperconverged-cluster-index:1.11.0-unstable
displayName: KubeVirt HyperConverged
publisher: KubeVirt Project
4 changes: 2 additions & 2 deletions deploy/olm-catalog/Dockerfile.bundle.ci-index-image-upgrade
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/fedora/fedora:37-x86_64 AS builder
ARG INITIAL_VERSION=1.10.0
ARG INITIAL_VERSION_SED="1\.10\.0"
ARG INITIAL_VERSION=1.11.0
ARG INITIAL_VERSION_SED="1\.11\.0"
ARG TARGET_VERSION=100.0.0
ARG PACKAGE_NAME=community-kubevirt-hyperconverged
ARG CSV_FILE=/manifests/kubevirt-hyperconverged-operator.v${TARGET_VERSION}.clusterserviceversion.yaml
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM scratch

ARG VERSION=1.10.0
ARG VERSION=1.11.0

LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
Expand Down
Loading

0 comments on commit f7496a0

Please sign in to comment.