From 2d625eccaacd43ddbf174ca80e3141a70e1e212e Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 27 Jun 2023 03:33:46 +0300 Subject: [PATCH] :zap: Rename `resourcelabels` to `labels` --- config/configStructs/tapConfig.go | 2 +- helm-chart/templates/00-namespace.yaml | 4 ++-- helm-chart/templates/01-service-account.yaml | 4 ++-- helm-chart/templates/02-cluster-role.yaml | 4 ++-- helm-chart/templates/03-cluster-role-binding.yaml | 4 ++-- helm-chart/templates/04-hub-pod.yaml | 4 ++-- helm-chart/templates/05-hub-service.yaml | 4 ++-- helm-chart/templates/06-front-pod.yaml | 4 ++-- helm-chart/templates/07-front-service.yaml | 4 ++-- helm-chart/templates/08-persistent-volume-claim.yaml | 4 ++-- helm-chart/templates/09-worker-daemon-set.yaml | 12 ++++++------ helm-chart/templates/10-ingress-class.yaml | 4 ++-- helm-chart/templates/11-ingress.yaml | 4 ++-- helm-chart/values.yaml | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index 145364e35..c636c80a8 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -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"` diff --git a/helm-chart/templates/00-namespace.yaml b/helm-chart/templates/00-namespace.yaml index 33af952fe..c9e2ef99c 100644 --- a/helm-chart/templates/00-namespace.yaml +++ b/helm-chart/templates/00-namespace.yaml @@ -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: {} diff --git a/helm-chart/templates/01-service-account.yaml b/helm-chart/templates/01-service-account.yaml index 94c5c73c4..aa54079a3 100644 --- a/helm-chart/templates/01-service-account.yaml +++ b/helm-chart/templates/01-service-account.yaml @@ -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 }} diff --git a/helm-chart/templates/02-cluster-role.yaml b/helm-chart/templates/02-cluster-role.yaml index 00be62e59..967827556 100644 --- a/helm-chart/templates/02-cluster-role.yaml +++ b/helm-chart/templates/02-cluster-role.yaml @@ -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 }} diff --git a/helm-chart/templates/03-cluster-role-binding.yaml b/helm-chart/templates/03-cluster-role-binding.yaml index 6dd0fb4f3..3a02116e3 100644 --- a/helm-chart/templates/03-cluster-role-binding.yaml +++ b/helm-chart/templates/03-cluster-role-binding.yaml @@ -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 }} diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml index f8fd07dde..c76565873 100644 --- a/helm-chart/templates/04-hub-pod.yaml +++ b/helm-chart/templates/04-hub-pod.yaml @@ -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 }} diff --git a/helm-chart/templates/05-hub-service.yaml b/helm-chart/templates/05-hub-service.yaml index d6daa1c7e..71a254fe9 100644 --- a/helm-chart/templates/05-hub-service.yaml +++ b/helm-chart/templates/05-hub-service.yaml @@ -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 }} diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml index 419436930..47b87cd76 100644 --- a/helm-chart/templates/06-front-pod.yaml +++ b/helm-chart/templates/06-front-pod.yaml @@ -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 }} diff --git a/helm-chart/templates/07-front-service.yaml b/helm-chart/templates/07-front-service.yaml index 3811470e7..4bf68b208 100644 --- a/helm-chart/templates/07-front-service.yaml +++ b/helm-chart/templates/07-front-service.yaml @@ -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 }} diff --git a/helm-chart/templates/08-persistent-volume-claim.yaml b/helm-chart/templates/08-persistent-volume-claim.yaml index ef1ac9029..71eb09ec5 100644 --- a/helm-chart/templates/08-persistent-volume-claim.yaml +++ b/helm-chart/templates/08-persistent-volume-claim.yaml @@ -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 }} diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index f0227033a..fd8e81466 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -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 diff --git a/helm-chart/templates/10-ingress-class.yaml b/helm-chart/templates/10-ingress-class.yaml index 34dd9ccf8..342066c42 100644 --- a/helm-chart/templates/10-ingress-class.yaml +++ b/helm-chart/templates/10-ingress-class.yaml @@ -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 }} diff --git a/helm-chart/templates/11-ingress.yaml b/helm-chart/templates/11-ingress.yaml index 75a6ca66a..6e79b2eaf 100644 --- a/helm-chart/templates/11-ingress.yaml +++ b/helm-chart/templates/11-ingress.yaml @@ -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 }} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 4e778e46c..00932c32e 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -41,7 +41,7 @@ tap: tls: true packetcapture: libpcap ignoretainted: false - resourcelabels: {} + labels: {} nodeselectorterms: [] ingress: enabled: false