Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable clusterlifecycle-metric on AKS #984

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 29 additions & 25 deletions controllers/toggle_components.go
Original file line number Diff line number Diff line change
Expand Up @@ -772,19 +772,21 @@ func (r *MultiClusterEngineReconciler) ensureNoImageBasedInstallOperator(ctx con
func (r *MultiClusterEngineReconciler) ensureClusterLifecycle(ctx context.Context,
mce *backplanev1.MultiClusterEngine) (ctrl.Result, error) {

namespacedName := types.NamespacedName{Name: "cluster-curator-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "clusterclaims-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "provider-credential-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "clusterlifecycle-state-metrics-v2", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "cluster-image-set-controller", Namespace: mce.Spec.TargetNamespace}
if utils.DeployOnOCP() {
namespacedName := types.NamespacedName{Name: "cluster-curator-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "clusterclaims-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "provider-credential-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
namespacedName = types.NamespacedName{Name: "cluster-image-set-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))
}
namespacedName := types.NamespacedName{Name: "clusterlifecycle-state-metrics-v2", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
r.StatusManager.AddComponent(toggle.EnabledStatus(namespacedName))

Expand Down Expand Up @@ -841,18 +843,20 @@ func (r *MultiClusterEngineReconciler) ensureNoClusterLifecycle(ctx context.Cont
return ctrl.Result{RequeueAfter: requeuePeriod}, nil
}

namespacedName := types.NamespacedName{Name: "cluster-curator-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "clusterclaims-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "provider-credential-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "cluster-image-set-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
if utils.DeployOnOCP() {
namespacedName := types.NamespacedName{Name: "cluster-curator-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "clusterclaims-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "provider-credential-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
namespacedName = types.NamespacedName{Name: "cluster-image-set-controller", Namespace: mce.Spec.TargetNamespace}
r.StatusManager.RemoveComponent(toggle.EnabledStatus(namespacedName))
r.StatusManager.AddComponent(toggle.DisabledStatus(namespacedName, []*unstructured.Unstructured{}))
}

// Deletes all templates
for _, template := range templates {
Expand Down
4 changes: 4 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ func main() {
Name: "ocm-webhook",
HostNames: []string{fmt.Sprintf("ocm-webhook.%s.svc", operatorNamespace)},
},
{
Name: "clusterlifecycle-state-metrics-certs",
HostNames: []string{fmt.Sprintf("clusterlifecycle-state-metrics-v2.%s.svc", operatorNamespace)},
},
}).Start(ctx)

if err = (&mcewebhook.Reconciler{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -112,3 +113,4 @@ rules:
- delete
- update
- list
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Copyright Contributors to the Open Cluster Management project.

{{- if .Values.global.deployOnOCP }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -111,4 +111,5 @@ spec:
{{ if .Effect }} effect: {{ .Effect }} {{- end }}
{{ if .TolerationSeconds }} tolerationSeconds: {{ .TolerationSeconds }} {{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -12,4 +13,5 @@ subjects:
roleRef:
kind: ClusterRole
name: {{ .Values.org }}.cluster-lifecycle.cluster-curator
apiGroup: rbac.authorization.k8s.io
apiGroup: rbac.authorization.k8s.io
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: cluster-curator
name: cluster-curator
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -59,3 +60,4 @@ rules:
- get
- create
- update
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Copyright Contributors to the Open Cluster Management project.

{{- if .Values.global.deployOnOCP }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -123,3 +123,4 @@ spec:
{{ if .TolerationSeconds }} tolerationSeconds: {{ .TolerationSeconds }} {{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -13,3 +14,4 @@ roleRef:
kind: ClusterRole
name: {{ .Values.org }}.cluster-lifecycle.cluster-image-set
apiGroup: rbac.authorization.k8s.io
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: cluster-image-set
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -89,4 +90,5 @@ rules:
resources:
- events
verbs:
- create
- create
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the Open Cluster Management project.

{{- if .Values.global.deployOnOCP }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -137,4 +137,5 @@ spec:
{{ if .Effect }} effect: {{ .Effect }} {{- end }}
{{ if .TolerationSeconds }} tolerationSeconds: {{ .TolerationSeconds }} {{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -12,4 +13,5 @@ subjects:
roleRef:
kind: ClusterRole
name: {{ .Values.org }}.cluster-lifecycle.clusterclaims
apiGroup: rbac.authorization.k8s.io
apiGroup: rbac.authorization.k8s.io
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: clusterclaims
name: clusterclaims
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the Open Cluster Management project

{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand All @@ -11,3 +11,4 @@ aggregationRule:
- matchLabels:
rbac.authorization.k8s.io/aggregate-to-ocm-cluster-manager-admin: 'true'
rules: []
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ rules:
- update
- get
- delete
- apiGroups:
- ""
resources:
- namespaces
verbs:
- get
# Allow hub to monitor and update status of csr
- apiGroups: ["hive.openshift.io"]
resources: ["clusterdeployments"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the Open Cluster Management project

{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -11,4 +11,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
namespace: openshift-monitoring
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ spec:
name: certs
readOnly: true
securityContext:
{{- if .Values.global.deployOnOCP }}
{{- if semverCompare ">=4.11.0" .Values.hubconfig.ocpVersion }}
seccompProfile:
type: RuntimeDefault
{{- end }}
{{- end }}
volumes:
- name: certs
secret:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the Open Cluster Management project

{{- if .Values.global.deployOnOCP }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
Expand All @@ -10,4 +10,5 @@ spec:
- name: acm_managed_cluster_worker_cores.rules
rules:
- expr: max by (hub_cluster_id, managed_cluster_id) (acm_managed_cluster_worker_cores)
record: 'acm_managed_cluster_worker_cores:max'
record: 'acm_managed_cluster_worker_cores:max'
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright Contributors to the Open Cluster Management project

{{- if .Values.global.deployOnOCP }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand All @@ -20,4 +20,5 @@ spec:
clc-app: clusterlifecycle-state-metrics-v2
namespaceSelector:
matchNames:
- {{ .Values.global.namespace }}
- {{ .Values.global.namespace }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -33,4 +34,5 @@ rules:
- events
verbs:
- create
- patch
- patch
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -11,4 +12,5 @@ subjects:
roleRef:
kind: ClusterRole
name: {{ .Values.org }}.cluster-lifecycle.provider-credential
apiGroup: rbac.authorization.k8s.io
apiGroup: rbac.authorization.k8s.io
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright Contributors to the Open Cluster Management project
{{- if .Values.global.deployOnOCP }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -132,4 +133,4 @@ spec:
{{ if .TolerationSeconds }} tolerationSeconds: {{ .TolerationSeconds }} {{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright Contributors to the Open Cluster Management project
---
{{- if .Values.global.deployOnOCP }}
apiVersion: v1
kind: ServiceAccount
metadata:
name: provider-credential
name: provider-credential
{{- end }}
1 change: 1 addition & 0 deletions pkg/templates/charts/toggle/cluster-lifecycle/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ global:
pullSecret: ""
namespace: default
hubSize: Small
deployOnOCP: ""
hubconfig:
nodeSelector: {}
proxyConfigs: {}
Expand Down
1 change: 1 addition & 0 deletions pkg/templates/rbac_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ var nonOCPComponents = []string{
backplanev1.HyperShift,
backplanev1.HypershiftLocalHosting,
backplanev1.LocalCluster,
backplanev1.ClusterLifecycle,
}

var GlobalDeployOnOCP = true
Expand Down
Loading