Skip to content

Commit

Permalink
Bump HCO to version 1.13.0
Browse files Browse the repository at this point in the history
Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
  • Loading branch information
nunnatsa committed May 2, 2024
1 parent 091697a commit b95f9b9
Show file tree
Hide file tree
Showing 33 changed files with 36,247 additions and 72 deletions.
8 changes: 4 additions & 4 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.12.0-unstable`. It is built and pushed on every merge to
The latest bundle is `quay.io/kubevirt/hyperconverged-cluster-bundle:1.13.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.12.0-unstable`.
that bundle: `quay.io/kubevirt/hyperconverged-cluster-index:1.13.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.12.0-unstable
image: quay.io/kubevirt/hyperconverged-cluster-index:1.13.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: "candidate-v1.12"
channel: "candidate-v1.13"
EOF
```
Then, create the HyperConverged custom resource to complete the installation.
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.12.0
ARG INITIAL_VERSION_SED="1\.12\.0"
ARG INITIAL_VERSION=1.13.0
ARG INITIAL_VERSION_SED="1\.13\.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.12.0
ARG VERSION=1.13.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 @@ -32,7 +32,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/os.linux: supported
name: kubevirt-hyperconverged-operator.v1.12.0
name: kubevirt-hyperconverged-operator.v1.13.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -3260,7 +3260,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-operator
name: hco-operator
spec:
Expand All @@ -3276,7 +3276,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-operator
spec:
containers:
Expand Down Expand Up @@ -3309,7 +3309,7 @@ spec:
- name: AMD64_MACHINETYPE
- name: ARM64_MACHINETYPE
- name: HCO_KV_IO_VERSION
value: 1.12.0
value: 1.13.0
- name: KUBEVIRT_VERSION
value: v1.2.0
- name: CDI_VERSION
Expand Down Expand Up @@ -3366,7 +3366,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-webhook
name: hco-webhook
spec:
Expand All @@ -3382,7 +3382,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-webhook
spec:
containers:
Expand Down Expand Up @@ -3441,7 +3441,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-cli-download
name: hyperconverged-cluster-cli-download
spec:
Expand All @@ -3457,7 +3457,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.12.0
app.kubernetes.io/version: 1.13.0
name: hyperconverged-cluster-cli-download
spec:
containers:
Expand Down Expand Up @@ -3485,7 +3485,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.12.0
app.kubernetes.io/version: 1.13.0
name: cluster-network-addons-operator
spec:
replicas: 1
Expand All @@ -3504,7 +3504,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.12.0
app.kubernetes.io/version: 1.13.0
name: cluster-network-addons-operator
prometheus.cnao.io: "true"
spec:
Expand Down Expand Up @@ -3598,7 +3598,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.12.0
app.kubernetes.io/version: 1.13.0
name: virt-operator
spec:
replicas: 2
Expand All @@ -3613,7 +3613,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.12.0
app.kubernetes.io/version: 1.13.0
kubevirt.io: virt-operator
name: virt-operator
prometheus.kubevirt.io: "true"
Expand Down Expand Up @@ -3718,7 +3718,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.12.0
app.kubernetes.io/version: 1.13.0
control-plane: ssp-operator
name: ssp-operator
name: ssp-operator
Expand All @@ -3736,7 +3736,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.12.0
app.kubernetes.io/version: 1.13.0
control-plane: ssp-operator
name: ssp-operator
prometheus.ssp.kubevirt.io: "true"
Expand Down Expand Up @@ -3793,7 +3793,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.12.0
app.kubernetes.io/version: 1.13.0
name: cdi-operator
spec:
replicas: 1
Expand All @@ -3808,7 +3808,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.12.0
app.kubernetes.io/version: 1.13.0
cdi.kubevirt.io: cdi-operator
name: cdi-operator
operator.cdi.kubevirt.io: ""
Expand Down Expand Up @@ -3881,7 +3881,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.12.0
app.kubernetes.io/version: 1.13.0
name: hostpath-provisioner-operator
spec:
replicas: 1
Expand All @@ -3896,7 +3896,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.12.0
app.kubernetes.io/version: 1.13.0
name: hostpath-provisioner-operator
operator.hostpath-provisioner.kubevirt.io: ""
prometheus.hostpathprovisioner.kubevirt.io: "true"
Expand Down Expand Up @@ -3996,7 +3996,7 @@ spec:
app.kubernetes.io/component: multi-tenant
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.12.0
app.kubernetes.io/version: 1.13.0
name: mtq-operator
spec:
replicas: 1
Expand All @@ -4011,7 +4011,7 @@ spec:
app.kubernetes.io/component: multi-tenant
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.12.0
app.kubernetes.io/version: 1.13.0
name: mtq-operator
operator.mtq.kubevirt.io: ""
prometheus.mtq.kubevirt.io: "true"
Expand Down Expand Up @@ -4067,7 +4067,7 @@ spec:
app.kubernetes.io/component: quota-management
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.12.0
app.kubernetes.io/version: 1.13.0
name: aaq-operator
spec:
replicas: 1
Expand All @@ -4082,7 +4082,7 @@ spec:
app.kubernetes.io/component: quota-management
app.kubernetes.io/managed-by: olm
app.kubernetes.io/part-of: hyperconverged-cluster
app.kubernetes.io/version: 1.12.0
app.kubernetes.io/version: 1.13.0
name: aaq-operator
operator.aaq.kubevirt.io: ""
prometheus.aaq.kubevirt.io: "true"
Expand Down Expand Up @@ -4924,12 +4924,12 @@ spec:
name: virt-operator
- image: quay.io/kubevirt/virtio-container-disk@sha256:f8e71a3a930ce95d646d80862d5ff6f9d3ed7ef2541dd2e2acec0bce26274734
name: virtio-container-disk
replaces: kubevirt-hyperconverged-operator.v1.11.0
replaces: kubevirt-hyperconverged-operator.v1.12.0
selector:
matchLabels:
alm-owner-kubevirt: kubevirt-hyperconverged
operated-by: kubevirt-hyperconverged
version: 1.12.0
version: 1.13.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.12.0
operators.operatorframework.io.bundle.channels.v1: 1.12.0
operators.operatorframework.io.bundle.channel.default.v1: 1.13.0
operators.operatorframework.io.bundle.channels.v1: 1.13.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/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:-candidate-v1.12}"
HCO_INDEX_IMAGE="${HCO_INDEX_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-index:1.12.0-unstable}"
HCO_CHANNEL="${HCO_CHANNEL:-candidate-v1.13}"
HCO_INDEX_IMAGE="${HCO_INDEX_IMAGE:-quay.io/kubevirt/hyperconverged-cluster-index:1.13.0-unstable}"
MARKETPLACE_MODE="${MARKETPLACE_MODE:-true}"
PRIVATE_REPO="${PRIVATE_REPO:-false}"
QUAY_USERNAME="${QUAY_USERNAME:-}"
Expand Down
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.12.0
ARG INITIAL_VERSION_SED="1\.12\.0"
ARG INITIAL_VERSION=1.13.0
ARG INITIAL_VERSION_SED="1\.13\.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.12.0
ARG VERSION=1.13.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 b95f9b9

Please sign in to comment.