Skip to content

Commit

Permalink
feat:Upgrade RHACM to 2.10
Browse files Browse the repository at this point in the history
Signed-off-by: Denilson Nastacio <[email protected]>
  • Loading branch information
nastacio committed Jul 8, 2024
1 parent df38c6b commit 7648741
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You may decide to include one or more of these `Application` objects to the targ

[IBM Cloud® Paks](https://www.ibm.com/cloud/paks) help organizations build, modernize, and manage applications securely across any cloud.

The supported deployment mechanisms for Cloud Paks are documented in their respective [documentation pages](https://www.ibm.com/docs/en/cloud-paks) and typically included a UI-based deployment through the Operator Hub page or, in some cases, scripted alternatives based on command-line interfaces.
The supported deployment mechanisms for Cloud Paks are documented in their respective [documentation pages](https://www.ibm.com/docs/en/cloud-paks) and typically include a UI-based deployment through the Operator Hub page or, in some cases, scripted alternatives based on command-line interfaces.

Supported versions:

Expand Down
6 changes: 3 additions & 3 deletions config/rhacm/cloudpaks/templates/placement-argocd.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
---
apiVersion: apps.open-cluster-management.io/v1
kind: PlacementRule
kind: Placement
metadata:
annotations:
argocd.argoproj.io/sync-wave: "200"
Expand Down Expand Up @@ -29,7 +29,7 @@ metadata:
namespace: policy
placementRef:
name: openshift-gitops-{{.}}
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: openshift-gitops-installed
Expand All @@ -45,7 +45,7 @@ metadata:
namespace: policy
placementRef:
name: openshift-gitops-{{.}}
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: openshift-gitops-argo-app
Expand Down
4 changes: 2 additions & 2 deletions config/rhacm/cloudpaks/templates/placement-cloudpaks.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
---
apiVersion: apps.open-cluster-management.io/v1
kind: PlacementRule
kind: Placement
metadata:
annotations:
argocd.argoproj.io/sync-wave: "200"
Expand All @@ -26,7 +26,7 @@ metadata:
namespace: policy
placementRef:
name: placement-openshift-gitops-cloudpaks-{{.}}
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: openshift-gitops-cloudpaks-{{.}}
Expand Down
2 changes: 1 addition & 1 deletion config/rhacm/cloudpaks/templates/placement-cp-shared.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
namespace: policy
placementRef:
name: openshift-gitops-{{.}}
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: openshift-gitops-cloudpaks-cp-shared
Expand Down
4 changes: 2 additions & 2 deletions config/rhacm/cloudpaks/templates/placement-gitops-policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{- range tuple "cp4a" "cp4aiops" "cp4d" "cp4i" "cp4s" }}
---
apiVersion: apps.open-cluster-management.io/v1
kind: PlacementRule
kind: Placement
metadata:
annotations:
argocd.argoproj.io/sync-wave: "200"
Expand All @@ -27,7 +27,7 @@ metadata:
namespace: "{{ $argocd_namespace }}"
placementRef:
name: placement-openshift-gitops-entitlement-key-{{.}}
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: cloudpak-entitlement-key
Expand Down
4 changes: 2 additions & 2 deletions config/rhacm/seeds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.15.1
version: 0.16.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 2.9.1
appVersion: 2.10.3
2 changes: 1 addition & 1 deletion config/rhacm/seeds/templates/0100-rhacm-subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
name: advanced-cluster-management
namespace: open-cluster-management
spec:
channel: release-2.9
channel: release-2.10
installPlanApproval: Automatic
name: advanced-cluster-management
source: redhat-operators
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/applications/managing-applications#gitops-config
# https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html/applications/managing-applications#gitops-config
---
apiVersion: cluster.open-cluster-management.io/v1beta2
kind: ManagedClusterSet
Expand Down
2 changes: 1 addition & 1 deletion config/rhacm/seeds/templates/0200-placement-gitops.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
apiVersion: apps.open-cluster-management.io/v1
kind: PlacementRule
kind: Placement
metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
Expand Down
2 changes: 1 addition & 1 deletion config/rhacm/seeds/templates/0200-placement-ocp.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
apiVersion: apps.open-cluster-management.io/v1
kind: PlacementRule
kind: Placement
metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
Expand Down
2 changes: 1 addition & 1 deletion config/rhacm/seeds/templates/0300-binding-gitops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
namespace: policy
placementRef:
name: all-openshift-gitops-rhacm
kind: PlacementRule
kind: Placement
apiGroup: apps.open-cluster-management.io
subjects:
- name: openshift-gitops-installed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html-single/clusters/index#hosting-service-cluster-configure-aws
# https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html-single/clusters/index#hosting-service-cluster-configure-aws
---
apiVersion: batch/v1
kind: Job
Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

- Cluster storage configured with storage classes supporting both [RWO and RWX storage](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes).

The applications were tested with [OpenShift Container Storage](https://docs.openshift.com/container-platform/4.8/storage/persistent_storage/persistent-storage-ocs.html), [Rook Ceph](https://github.com/rook/rook), [AWS EFS](https://aws.amazon.com/efs/), and the built-in file storage in ROKS classic clusters.
The applications were tested with [OpenShift Data Foundation](https://access.redhat.com/documentation/en-us/red_hat_openshift_data_foundation), [Rook Ceph](https://github.com/rook/rook), [AWS EFS](https://aws.amazon.com/efs/), and the built-in file storage in ROKS classic clusters.

- [An entitlement key to the IBM Entitled Registry](#obtain-an-entitlement-key)

Expand Down
4 changes: 2 additions & 2 deletions docs/rhacm.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This repository contains governance policies and placement rules for Argo CD and

- Adequate worker node capacity in the cluster for RHACM to be installed.

Refer to the [RHACM documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/install/installing#sizing-your-cluster) to determine the required capacity for the cluster.
Refer to the [RHACM documentation](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html/install/installing#sizing-your-cluster) to determine the required capacity for the cluster.

- [An entitlement key to the IBM Entitled Registry](#obtain-an-entitlement-key). This key is required in the RHACM cluster to be copied to the managed clusters when a cluster matches a policy to install a Cloud Pak.

Expand Down Expand Up @@ -244,7 +244,7 @@ Labels:
- `gitops-branch` + `cp4i`: Placement for Cloud Pak for Integration.
- `gitops-branch` + `cp4s`: Placement for Cloud Pak for Security.
- `gitops-branch` + `cp4aiops`: Placement for Cloud Pak for AIOps.
- `gitops-remote` + `true`: Assign cluster to the `gitops-cluster` cluster-set, registering it to the [GitOps Cluster](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.9/html/applications/managing-applications#gitops-config).
- `gitops-remote` + `true`: Assign cluster to the `gitops-cluster` cluster-set, registering it to the [GitOps Cluster](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.10/html/applications/managing-applications#gitops-config).
Values for each label:
Expand Down

0 comments on commit 7648741

Please sign in to comment.