Skip to content

Commit

Permalink
updated version 2.11 => 2.12 (#1605)
Browse files Browse the repository at this point in the history
Signed-off-by: Disaiah Bennett <[email protected]>
  • Loading branch information
dislbenn authored Jul 3, 2024
1 parent acd6616 commit 31d3856
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion COMPONENT_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.11.0
2.12.0
2 changes: 1 addition & 1 deletion Makefile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ regenerate-charts-from-bundles: ## Regenerates the operator charts from bundles

regenerate-operator-sha-commits: ## Regenerates the operator bundles
pip3 install -r hack/bundle-automation/requirements.txt
python3 ./hack/bundle-automation/generate-shell.py --update-commits --repo pipeline --branch 2.11-integration
python3 ./hack/bundle-automation/generate-shell.py --update-commits --repo pipeline --branch 2.12-integration

regenerate-charts: ## Regenerates the charts
pip3 install -r hack/bundle-automation/chart-requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions hack/bundle-automation/chart-templates/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
description: A Helm chart for Kubernetes
name: test
type: application
version: 2.11.0
version: 2.12.0
2 changes: 1 addition & 1 deletion hack/prereqs/oc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: operators.coreos.com/v1
kind: OperatorCondition
metadata:
name: advanced-cluster-management-v2.11.0
name: advanced-cluster-management-v2.12.0
namespace: open-cluster-management
2 changes: 1 addition & 1 deletion pkg/multiclusterengine/multiclusterengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

var (
// prod MCE variables
channel = "stable-2.6"
channel = "stable-2.7"
installPlanApproval = subv1alpha1.ApprovalAutomatic
packageName = "multicluster-engine"
catalogSourceName = "redhat-operators"
Expand Down
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/cluster-backup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
category: "Development"
description: Helm chart for Open Cluster Management Cluster Backup Operator
keywords:
- backup
- restore
name: cluster-backup-chart
version: 2.11.0
version: 2.12.0
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/cluster-lifecycle/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
description: Helm chart for deploying the cluster lifecycle
kubeVersion: ">=1.11.0-0"
name: cluster-lifecycle
version: 2.11.0
version: 2.12.0
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/console/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
category: "Development"
description: Helm chart for Open Cluster Management Console
keywords:
- ui
kubeVersion: ">=1.10.0-0"
name: console-chart
version: 2.11.0
version: 2.12.0
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/grc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
description: A Helm chart for multicloud grc
category: "Development"
keywords:
- acm
- grc
name: grc
verified: "RHACM"
version: 2.11.0
version: 2.12.0
6 changes: 3 additions & 3 deletions pkg/templates/charts/toggle/insights/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
description: Helm chart to install the Open Cluster Management Insights
icon: https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.png
keywords:
Expand All @@ -15,5 +15,5 @@ keywords:
- amd64
- runtime
name: policyreport
tillerVersion: ">=2.11.0"
version: 2.11.0
tillerVersion: ">=2.12.0"
version: 2.12.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
description: An operator for deploying resources from object Bucket, helm repo or
github repo to multiple managed clusters
name: multicloud-operators-subscription
type: application
version: 2.11.0
version: 2.12.0
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
description: A Helm chart for Kubernetes
name: multicluster-observability-operator
type: application
version: 2.11.0
version: 2.12.0
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/search-v2-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
description: A Helm chart for Kubernetes
name: search-v2-operator
type: application
version: 2.11.0
version: 2.12.0
4 changes: 2 additions & 2 deletions pkg/templates/charts/toggle/submariner-addon/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 2.11.0
appVersion: 2.12.0
description: A Helm chart for Kubernetes
name: submariner-addon
type: application
version: 2.11.0
version: 2.12.0
2 changes: 1 addition & 1 deletion pkg/templates/charts/toggle/volsync-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright Contributors to the Open Cluster Management project

apiVersion: v1
appVersion: 2.11.0
appVersion: 2.12.0
description: Helm chart for the Volsync Addon Controller
name: volsync-addon-controller
keywords:
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var MinimumOCPVersion string = "4.10.0"
// RequiredMCEVersion is the minimum version of MCE this operator expects.
// The reconciler will wait until MCE has installed to at least this version
// before proceeding with installing ACM.
var RequiredMCEVersion = "2.6.0"
var RequiredMCEVersion = "2.7.0"
var RequiredCommunityMCEVersion = "0.5.0"

func init() {
Expand Down

0 comments on commit 31d3856

Please sign in to comment.