Rename resourcelabels to labels

This commit is contained in:
M. Mert Yildiran 2023-06-27 03:33:46 +03:00
parent 19443501da
commit 2d625eccaa
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
14 changed files with 30 additions and 30 deletions

View File

@ -110,7 +110,7 @@ type TapConfig struct {
Tls bool `yaml:"tls" json:"tls" default:"true"`
PacketCapture string `yaml:"packetcapture" json:"packetcapture" default:"libpcap"`
IgnoreTainted bool `yaml:"ignoretainted" json:"ignoretainted" default:"false"`
ResourceLabels map[string]string `yaml:"resourcelabels" json:"resourcelabels" default:"{}"`
Labels map[string]string `yaml:"labels" json:"labels" default:"{}"`
NodeSelectorTerms []v1.NodeSelectorTerm `yaml:"nodeselectorterms" json:"nodeselectorterms" default:"[]"`
Ingress IngressConfig `yaml:"ingress" json:"ingress"`
Debug bool `yaml:"debug" json:"debug" default:"false"`

View File

@ -4,8 +4,8 @@ kind: Namespace
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: {{ .Values.tap.selfnamespace }}
spec: {}

View File

@ -4,8 +4,8 @@ kind: ServiceAccount
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-service-account
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -4,8 +4,8 @@ kind: ClusterRole
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-cluster-role
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -4,8 +4,8 @@ kind: ClusterRoleBinding
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-cluster-role-binding
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -5,8 +5,8 @@ metadata:
creationTimestamp: null
labels:
app: kubeshark-hub
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-hub
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -4,8 +4,8 @@ kind: Service
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-hub
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -5,8 +5,8 @@ metadata:
creationTimestamp: null
labels:
app: kubeshark-front
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-front
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -4,8 +4,8 @@ kind: Service
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-front
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -5,8 +5,8 @@ kind: PersistentVolumeClaim
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-persistent-volume-claim
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -5,8 +5,8 @@ metadata:
creationTimestamp: null
labels:
app: kubeshark-worker-daemon-set
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-worker-daemon-set
namespace: {{ .Values.tap.selfnamespace }}
@ -14,16 +14,16 @@ spec:
selector:
matchLabels:
app: kubeshark-worker-daemon-set
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 6 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 6 }}
{{- end }}
template:
metadata:
creationTimestamp: null
labels:
app: kubeshark-worker-daemon-set
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 8 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 8 }}
{{- end }}
name: kubeshark-worker-daemon-set
namespace: kubeshark

View File

@ -5,8 +5,8 @@ kind: IngressClass
metadata:
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-ingress-class
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -8,8 +8,8 @@ metadata:
nginx.ingress.kubernetes.io/rewrite-target: /$2
creationTimestamp: null
labels:
{{- if .Values.tap.resourcelabels }}
{{- toYaml .Values.tap.resourcelabels | nindent 4 }}
{{- if .Values.tap.labels }}
{{- toYaml .Values.tap.labels | nindent 4 }}
{{- end }}
name: kubeshark-ingress
namespace: {{ .Values.tap.selfnamespace }}

View File

@ -41,7 +41,7 @@ tap:
tls: true
packetcapture: libpcap
ignoretainted: false
resourcelabels: {}
labels: {}
nodeselectorterms: []
ingress:
enabled: false