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

[charts/karavi-observability] Make app.kubernetes.io/name and name consistent #107

Merged
merged 2 commits into from
Feb 15, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/name: karavi_metrics_powerflex
app.kubernetes.io/name: karavi-metrics-powerflex
app.kubernetes.io/instance: {{ .Release.Name }}
name: karavi-metrics-powerflex
spec:
Expand All @@ -14,7 +14,7 @@ spec:
port: 2222
targetPort: 2222
selector:
app.kubernetes.io/name: karavi_metrics_powerflex
app.kubernetes.io/name: karavi-metrics-powerflex
app.kubernetes.io/instance: {{ .Release.Name }}

---
Expand All @@ -24,7 +24,7 @@ kind: Deployment
metadata:
name: karavi-metrics-powerflex
labels:
app.kubernetes.io/name: karavi_metrics_powerflex
app.kubernetes.io/name: karavi-metrics-powerflex
app.kubernetes.io/instance: {{ .Release.Name }}
{{- if hasKey .Values "karaviMetricsPowerflex.authorization" }}
{{- if eq .Values.karaviMetricsPowerflex.authorization.enabled true }}
Expand All @@ -35,14 +35,14 @@ metadata:
spec:
selector:
matchLabels:
app.kubernetes.io/name: karavi_metrics_powerflex
app.kubernetes.io/name: karavi-metrics-powerflex
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: 1
strategy: {}
template:
metadata:
labels:
app.kubernetes.io/name: karavi_metrics_powerflex
app.kubernetes.io/name: karavi-metrics-powerflex
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
serviceAccount: {{ .Release.Name }}-metrics-powerflex-controller
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/name: karavi_metrics_powerstore
app.kubernetes.io/name: karavi-metrics-powerstore
app.kubernetes.io/instance: {{ .Release.Name }}
name: karavi-metrics-powerstore
spec:
Expand All @@ -14,7 +14,7 @@ spec:
port: 9090
targetPort: 9090
selector:
app.kubernetes.io/name: karavi_metrics_powerstore
app.kubernetes.io/name: karavi-metrics-powerstore
app.kubernetes.io/instance: {{ .Release.Name }}

---
Expand All @@ -24,19 +24,19 @@ kind: Deployment
metadata:
name: karavi-metrics-powerstore
labels:
app.kubernetes.io/name: karavi_metrics_powerstore
app.kubernetes.io/name: karavi-metrics-powerstore
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
selector:
matchLabels:
app.kubernetes.io/name: karavi_metrics_powerstore
app.kubernetes.io/name: karavi-metrics-powerstore
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: 1
strategy: {}
template:
metadata:
labels:
app.kubernetes.io/name: karavi_metrics_powerstore
app.kubernetes.io/name: karavi-metrics-powerstore
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
serviceAccount: {{ .Release.Name }}-metrics-powerstore-controller
Expand Down
10 changes: 5 additions & 5 deletions charts/karavi-observability/templates/karavi-topology.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/name: karavi_topology
app.kubernetes.io/name: karavi-topology
app.kubernetes.io/instance: {{ .Release.Name }}
name: karavi-topology
spec:
Expand All @@ -14,7 +14,7 @@ spec:
port: 8443
targetPort: 8443
selector:
app.kubernetes.io/name: karavi_topology
app.kubernetes.io/name: karavi-topology
app.kubernetes.io/instance: {{ .Release.Name }}

---
Expand All @@ -24,19 +24,19 @@ kind: Deployment
metadata:
name: karavi-topology
labels:
app.kubernetes.io/name: karavi_topology
app.kubernetes.io/name: karavi-topology
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
selector:
matchLabels:
app.kubernetes.io/name: karavi_topology
app.kubernetes.io/name: karavi-topology
app.kubernetes.io/instance: {{ .Release.Name }}
replicas: 1
strategy: {}
template:
metadata:
labels:
app.kubernetes.io/name: karavi_topology
app.kubernetes.io/name: karavi-topology
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
volumes:
Expand Down