Remove license checks from webhook server

Signed-off-by: Tamal Saha <[email protected]>
kubevault · Apr 2, 2024 · bd17c75 · bd17c75
1 parent 0a38e60
commit bd17c75
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 196 deletions.
diff --git a/apis/installer/v1alpha1/kubevault_webhook_server_types.go b/apis/installer/v1alpha1/kubevault_webhook_server_types.go
@@ -47,15 +47,11 @@ type KubevaultWebhookServerSpec struct {
 	//+optional
 	NameOverride string `json:"nameOverride"`
 	//+optional
-	FullnameOverride string `json:"fullnameOverride"`
-	ReplicaCount     int32  `json:"replicaCount"`
-	RegistryFQDN     string `json:"registryFQDN"`
-	// +optional
-	License string `json:"license"`
-	// +optional
-	LicenseSecretName string    `json:"licenseSecretName"`
-	Server            Container `json:"server"`
-	ImagePullPolicy   string    `json:"imagePullPolicy"`
+	FullnameOverride string    `json:"fullnameOverride"`
+	ReplicaCount     int32     `json:"replicaCount"`
+	RegistryFQDN     string    `json:"registryFQDN"`
+	Server           Container `json:"server"`
+	ImagePullPolicy  string    `json:"imagePullPolicy"`
 	//+optional
 	ImagePullSecrets []string `json:"imagePullSecrets"`
 	//+optional

diff --git a/charts/kubevault-webhook-server/README.md b/charts/kubevault-webhook-server/README.md
diff --git a/charts/kubevault-webhook-server/templates/_helpers.tpl b/charts/kubevault-webhook-server/templates/_helpers.tpl
@@ -62,24 +62,6 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{/*
-Returns the appscode license
-*/}}
-{{- define "appscode.license" -}}
-{{- .Values.license }}
-{{- end }}
-
-{{/*
-Returns the appscode license secret name
-*/}}
-{{- define "appscode.licenseSecretName" -}}
-{{- if .Values.licenseSecretName }}
-{{- .Values.licenseSecretName -}}
-{{- else if .Values.license }}
-{{- printf "%s-license" (include "kubevault-webhook-server.fullname" .) -}}
-{{- end }}
-{{- end }}
-
 {{/*
 Returns the registry used for operator docker image
 */}}

diff --git a/charts/kubevault-webhook-server/templates/deployment.yaml b/charts/kubevault-webhook-server/templates/deployment.yaml
@@ -50,9 +50,6 @@ spec:
         - --enable-mutating-webhook={{ .Values.apiserver.enableMutatingWebhook }}
         - --enable-validating-webhook={{ .Values.apiserver.enableValidatingWebhook }}
         - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }}
-        {{- if include "appscode.licenseSecretName" . }}
-        - --license-file=/var/run/secrets/appscode/license/key.txt
-        {{- end }}
         env:
         - name: POD_NAME
           valueFrom:
@@ -70,10 +67,6 @@ spec:
           name: tmpdir
         - mountPath: /var/serving-cert
           name: serving-cert
-        {{- if include "appscode.licenseSecretName" . }}
-        - mountPath: /var/run/secrets/appscode/license
-          name: license
-        {{- end }}
       {{- if .Values.apiserver.healthcheck.enabled }}
         readinessProbe:
           httpGet:
@@ -98,12 +91,6 @@ spec:
         secret:
           defaultMode: 420
           secretName: {{ include "kubevault-webhook-server.fullname" . }}-apiserver-cert
-      {{- if include "appscode.licenseSecretName" . }}
-      - name: license
-        secret:
-          defaultMode: 420
-          secretName: {{ include "appscode.licenseSecretName" . }}
-      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
     {{- if or .Values.tolerations $criticalAddon }}

diff --git a/charts/kubevault-webhook-server/templates/license-checker-cluster-role-binding.yaml b/charts/kubevault-webhook-server/templates/license-checker-cluster-role-binding.yaml
diff --git a/charts/kubevault-webhook-server/templates/license-checker-cluster-role.yaml b/charts/kubevault-webhook-server/templates/license-checker-cluster-role.yaml
diff --git a/charts/kubevault-webhook-server/templates/license-reader-cluster-role-binding.yaml b/charts/kubevault-webhook-server/templates/license-reader-cluster-role-binding.yaml
diff --git a/charts/kubevault-webhook-server/templates/license-reader-cluster-role.yaml b/charts/kubevault-webhook-server/templates/license-reader-cluster-role.yaml
diff --git a/charts/kubevault-webhook-server/templates/license.yaml b/charts/kubevault-webhook-server/templates/license.yaml
diff --git a/charts/kubevault-webhook-server/values.openapiv3_schema.yaml b/charts/kubevault-webhook-server/values.openapiv3_schema.yaml
@@ -954,10 +954,6 @@ properties:
     items:
       type: string
     type: array
-  license:
-    type: string
-  licenseSecretName:
-    type: string
   logLevel:
     format: int32
     type: integer

diff --git a/charts/kubevault-webhook-server/values.yaml b/charts/kubevault-webhook-server/values.yaml
@@ -9,17 +9,6 @@ nameOverride: ""
 fullnameOverride: ""
 # Number of KubeVault webhook server replicas to create (only 1 is supported)
 replicaCount: 1
-# License for the product.
-# Get a license by following the steps from [here](https://kubevault.com/docs/latest/setup/install/enterprise/#get-a-trial-license).
-# Example:
-# helm install appscode/kubevault-ops-manager \
-#   --set-file license=/path/to/license/file
-# or
-# helm install appscode/kubevault-ops-manager \
-#   --set license=<license file content>
-license: ""
-# Name of Secret with the license as key.txt key
-licenseSecretName: ""
 # Docker registry fqdn used to pull docker images
 # Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image}
 registryFQDN: ghcr.io

diff --git a/charts/kubevault/values.openapiv3_schema.yaml b/charts/kubevault/values.openapiv3_schema.yaml
@@ -2516,10 +2516,6 @@ properties:
         items:
           type: string
         type: array
-      license:
-        type: string
-      licenseSecretName:
-        type: string
       logLevel:
         format: int32
         type: integer