resolved merge conflict

Signed-off-by: dislbenn <[email protected]>
stolostron · Dec 17, 2024 · 534c900 · 534c900
2 parents 73106c7 + a9dd20b
commit 534c900
Show file tree

Hide file tree

Showing 40 changed files with 13,276 additions and 35 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -646,6 +646,27 @@ rules:
   verbs:
   - patch
   - update
+- apiGroups:
+  - addons.cluster.x-k8s.io
+  resources:
+  - '*'
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - addons.cluster.x-k8s.io
+  resources:
+  - clusterresourcesets/finalizers
+  - clusterresourcesets/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - admission.hive.openshift.io
   resources:
@@ -1147,6 +1168,33 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  - controlplane.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - '*'
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - '*'
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - capi-provider.agent-install.openshift.io
   resources:
@@ -1479,6 +1527,202 @@ rules:
   - placements/finalizers
   verbs:
   - update
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusterclasses
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusterclasses
+  - clusterclasses/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  - clusters/finalizers
+  - clusters/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  - clusters/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinedeployments
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinedeployments
+  - machinedeployments/finalizers
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinedeployments
+  - machinedeployments/finalizers
+  - machinedeployments/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinehealthchecks
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinehealthchecks
+  - machinehealthchecks/finalizers
+  - machinehealthchecks/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinepools
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinepools
+  - machinepools/finalizers
+  - machinepools/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machines
+  - machines/finalizers
+  - machines/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machines
+  - machines/status
+  verbs:
+  - delete
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinesets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinesets
+  - machinesets/finalizers
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machinesets
+  - machinesets/finalizers
+  - machinesets/status
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - clusterview.open-cluster-management.io
   resources:
@@ -1969,6 +2213,14 @@ rules:
   verbs:
   - patch
   - update
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddressclaims
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - metal3.io
   resources:
@@ -2440,6 +2692,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - runtime.cluster.x-k8s.io
+  resources:
+  - extensionconfigs
+  - extensionconfigs/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - scheduling.k8s.io
   resources:

diff --git a/hack/bundle-automation/charts-config.yaml b/hack/bundle-automation/charts-config.yaml
@@ -1,4 +1,3 @@
-
 - repo_name: "managed-serviceaccount"
   github_ref: "https://github.com/stolostron/managed-serviceaccount.git"
   branch: "backplane-2.8"
@@ -18,6 +17,24 @@
         - "INSTALL_NAMESPACE"
       auto-install-for-all-clusters: true
 
+- repo_name: "cluster-api-installer"
+  github_ref: "https://github.com/stolostron/cluster-api-installer.git"
+  branch: "main"
+  charts:
+    - name: "cluster-api"
+      chart-path: "charts/cluster-api"
+      always-or-toggle: "toggle"
+      imageMappings:
+        ose-cluster-api-rhel9: ose_cluster_api_rhel9
+      inclusions:
+        - "pullSecretOverride"
+      skipRBACOverrides: true
+      updateChartVersion: true # the chart version will be retrieved from trimmed branch name, e.g. backplane-2.6 -> 2.6
+      escape-template-variables:
+        - "CLUSTER_NAME"
+        - "HUB_KUBECONFIG"
+        - "INSTALL_NAMESPACE"
+
 - repo_name: "cluster-api-installer"
   github_ref: "https://github.com/stolostron/cluster-api-installer.git"
   branch: "main"
@@ -34,4 +51,4 @@
       escape-template-variables:
         - "CLUSTER_NAME"
         - "HUB_KUBECONFIG"
-        - "INSTALL_NAMESPACE"
+        - "INSTALL_NAMESPACE"
diff --git a/...emplates/charts/hosting/server-foundation/templates/managedcluster-import-deployment.yaml b/...emplates/charts/hosting/server-foundation/templates/managedcluster-import-deployment.yaml
@@ -95,9 +95,6 @@ spec:
           requests:
             memory: "96Mi"
             cpu: "50m"
-          limits:
-            memory: "2Gi"
-            cpu: "500m"
         env:
 {{- if .Values.hubconfig.proxyConfigs }}
         - name: HTTP_PROXY

diff --git a/pkg/templates/charts/toggle/cluster-api/Chart.yaml b/pkg/templates/charts/toggle/cluster-api/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: cluster-api
+description: Cluster API
+type: application
+version: "4.18"
+appVersion: "4.18"
diff --git a/...plates/charts/toggle/cluster-api/templates/capi-admin-rolebinding-clusterrolebinding.yaml b/...plates/charts/toggle/cluster-api/templates/capi-admin-rolebinding-clusterrolebinding.yaml
@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: cluster-api
+  name: capi-admin-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: capi-manager
+  namespace: capi-system
diff --git a/...mplates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml b/...mplates/charts/toggle/cluster-api/templates/capi-aggregated-manager-role-clusterrole.yaml
@@ -0,0 +1,13 @@
+
+# Source: cluster-api/templates/roles.yaml
+aggregationRule:
+  clusterRoleSelectors:
+    - matchLabels:
+        cluster.x-k8s.io/aggregate-to-manager: "true"
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: cluster-api
+  name: capi-aggregated-manager-role
+rules: []