diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index e1cdf4e55..145364e35 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -81,17 +81,17 @@ type ResourcesConfig struct { } type AuthConfig struct { - ApprovedDomains []string `yaml:"approvedDomains" json:"approvedDomains" default:"[]"` + ApprovedDomains []string `yaml:"approveddomains" json:"approveddomains" default:"[]"` } type IngressConfig struct { Enabled bool `yaml:"enabled" json:"enabled" default:"false"` - ClassName string `yaml:"className" json:"className" default:"kubeshark-ingress-class"` + ClassName string `yaml:"classname" json:"classname" default:"kubeshark-ingress-class"` Controller string `yaml:"controller" json:"controller" default:"k8s.io/ingress-nginx"` Host string `yaml:"host" json:"host" default:"ks.svc.cluster.local"` TLS []networking.IngressTLS `yaml:"tls" json:"tls"` Auth AuthConfig `yaml:"auth" json:"auth"` - CertManager string `yaml:"certManager" json:"certManager" default:"letsencrypt-prod"` + CertManager string `yaml:"certmanager" json:"certmanager" default:"letsencrypt-prod"` } type TapConfig struct { diff --git a/helm-chart/README.md b/helm-chart/README.md index d682eaba4..79a657849 100644 --- a/helm-chart/README.md +++ b/helm-chart/README.md @@ -58,7 +58,7 @@ Visit [localhost:8899](http://localhost:8899) helm install kubeshark kubeshark/kubeshark \ --set tap.ingress.enabled=true \ --set tap.ingress.host=ks.svc.cluster.local \ - --set "tap.ingress.auth.approvedDomains={gmail.com}" \ + --set "tap.ingress.auth.approveddomains={gmail.com}" \ --set license=LICENSE_GOES_HERE ``` You can get your license [here](https://console.kubeshark.co/). diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml index 8994a530c..f8fd07dde 100644 --- a/helm-chart/templates/04-hub-pod.yaml +++ b/helm-chart/templates/04-hub-pod.yaml @@ -26,7 +26,7 @@ spec: - name: SCRIPTING_SCRIPTS value: '[]' - name: AUTH_APPROVED_DOMAINS - value: '{{ gt (len .Values.tap.ingress.auth.approvedDomains) 0 | ternary (join "," .Values.tap.ingress.auth.approvedDomains) "" }}' + value: '{{ gt (len .Values.tap.ingress.auth.approveddomains) 0 | ternary (join "," .Values.tap.ingress.auth.approveddomains) "" }}' image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}' imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }} name: kubeshark-hub diff --git a/helm-chart/templates/11-ingress.yaml b/helm-chart/templates/11-ingress.yaml index 742726a42..75a6ca66a 100644 --- a/helm-chart/templates/11-ingress.yaml +++ b/helm-chart/templates/11-ingress.yaml @@ -4,7 +4,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: annotations: - certmanager.k8s.io/cluster-issuer: '{{ .Values.tap.ingress.certManager }}' + certmanager.k8s.io/cluster-issuer: '{{ .Values.tap.ingress.certmanager }}' nginx.ingress.kubernetes.io/rewrite-target: /$2 creationTimestamp: null labels: @@ -14,7 +14,7 @@ metadata: name: kubeshark-ingress namespace: {{ .Values.tap.selfnamespace }} spec: - ingressClassName: {{ .Values.tap.ingress.className }} + ingressClassName: {{ .Values.tap.ingress.classname }} rules: - host: {{ .Values.tap.ingress.host }} http: diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index dcbe932d1..4e778e46c 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -45,13 +45,13 @@ tap: nodeselectorterms: [] ingress: enabled: false - className: kubeshark-ingress-class + classname: kubeshark-ingress-class controller: k8s.io/ingress-nginx host: ks.svc.cluster.local tls: [] auth: - approvedDomains: [] - certManager: letsencrypt-prod + approveddomains: [] + certmanager: letsencrypt-prod debug: false logs: file: ""