Skip to content

Commit 0eb65b6

Browse files
faloxtremes
andauthored
fix: reverting - add cluster-health-analyzer v0.5.1 (#785) (#812) (#834)
This reverts commit 315b436. Co-authored-by: Tomas Remes <tremes@users.noreply.github.com>
1 parent 51591f3 commit 0eb65b6

File tree

2 files changed

+0
-63
lines changed

2 files changed

+0
-63
lines changed

pkg/controllers/uiplugin/components.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ func pluginComponentReconcilers(plugin *uiv1alpha1.UIPlugin, pluginInfo UIPlugin
117117
components = append(components, reconciler.NewUpdater(newHealthAnalyzerPrometheusRole(namespace), plugin))
118118
components = append(components, reconciler.NewUpdater(newHealthAnalyzerPrometheusRoleBinding(namespace), plugin))
119119
components = append(components, reconciler.NewUpdater(newHealthAnalyzerService(namespace), plugin))
120-
components = append(components, reconciler.NewUpdater(newHealthAnalyzerServiceMCP(namespace), plugin))
121120
components = append(components, reconciler.NewUpdater(newHealthAnalyzerDeployment(namespace, serviceAccountName, pluginInfo), plugin))
122121
components = append(components, reconciler.NewUpdater(newHealthAnalyzerServiceMonitor(namespace), plugin))
123122
}

pkg/controllers/uiplugin/health_analyzer.go

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -94,37 +94,6 @@ func newHealthAnalyzerService(namespace string) *corev1.Service {
9494
return service
9595
}
9696

97-
func newHealthAnalyzerServiceMCP(namespace string) *corev1.Service {
98-
service := &corev1.Service{
99-
TypeMeta: metav1.TypeMeta{
100-
APIVersion: corev1.SchemeGroupVersion.String(),
101-
Kind: "Service",
102-
},
103-
ObjectMeta: metav1.ObjectMeta{
104-
Name: name + "-mcp",
105-
Namespace: namespace,
106-
Annotations: map[string]string{
107-
"service.beta.openshift.io/serving-cert-secret-name": volumeMountName,
108-
},
109-
Labels: componentLabels(name),
110-
},
111-
Spec: corev1.ServiceSpec{
112-
Ports: []corev1.ServicePort{
113-
{
114-
Name: "mcp",
115-
Port: 8085,
116-
TargetPort: intstr.FromString("mcp"),
117-
},
118-
},
119-
Selector: map[string]string{
120-
"app.kubernetes.io/instance": name,
121-
},
122-
},
123-
}
124-
125-
return service
126-
}
127-
12897
func newHealthAnalyzerDeployment(namespace string, serviceAccountName string, pluginInfo UIPluginInfo) *appsv1.Deployment {
12998
deploy := &appsv1.Deployment{
13099
TypeMeta: metav1.TypeMeta{
@@ -191,37 +160,6 @@ func newHealthAnalyzerDeployment(namespace string, serviceAccountName string, pl
191160
},
192161
},
193162
},
194-
{
195-
Name: name + "mcp",
196-
Image: pluginInfo.HealthAnalyzerImage,
197-
ImagePullPolicy: corev1.PullAlways,
198-
Args: []string{
199-
"mcp",
200-
},
201-
Env: []corev1.EnvVar{
202-
{
203-
Name: "PROM_URL",
204-
Value: "https://thanos-querier.openshift-monitoring.svc.cluster.local:9091/",
205-
},
206-
},
207-
SecurityContext: &corev1.SecurityContext{
208-
RunAsNonRoot: ptr.To(true),
209-
AllowPrivilegeEscalation: ptr.To(false),
210-
Capabilities: &corev1.Capabilities{
211-
Drop: []corev1.Capability{"ALL"},
212-
},
213-
SeccompProfile: &corev1.SeccompProfile{
214-
Type: corev1.SeccompProfileTypeRuntimeDefault,
215-
},
216-
},
217-
Ports: []corev1.ContainerPort{
218-
{
219-
ContainerPort: 8085,
220-
Name: "mcp",
221-
},
222-
},
223-
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
224-
},
225163
},
226164
Volumes: []corev1.Volume{
227165
{

0 commit comments

Comments
 (0)