Move http-server chart up one level

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

chart/http/inlets-http-server/README.md → chart/inlets-http-server/README.md

@@ -1,10 +1,16 @@
+# inlets-http-server
+
+This is the helm chart for an inlets PRO HTTP server
+
+Use it to deploy one or more inlets PRO HTTP tunnel servers to your Kubernetes cluster using a wildcard domain.
+
 # Use your Kubernetes cluster for inlets-pro HTTP exit-servers
 
 Clone the repository:
 
 ```bash
 git clone https://github.com/inlets/inlets-pro
-cd inlets-pro/chart/http/inlets-http-server
+cd inlets-pro/chart/inlets-http-server
 ```
 
 ## Setup cert-manager, Ingress and a DNS01 certificate

chart/http/inlets-http-server/templates/control-plane-ingress.yaml → chart/inlets-http-server/templates/control-plane-ingress.yaml

@@ -1,4 +1,4 @@
-{{- $fullName := include "inlets-pro-http.fullname" . -}}
+{{- $fullName := include "inlets-http-server.fullname" . -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
@@ -8,7 +8,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    {{- include "inlets-pro-http.labels" . | nindent 4 }}
+    {{- include "inlets-http-server.labels" . | nindent 4 }}
   {{- with .Values.controlPlaneIngress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -24,5 +24,5 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ include "inlets-pro-http.fullname" . }}
+              serviceName: {{ include "inlets-http-server.fullname" . }}
               servicePort: {{ .Values.controlPlane.port }}

chart/http/inlets-http-server/templates/data-plane-ingress.yaml → chart/inlets-http-server/templates/data-plane-ingress.yaml

@@ -1,7 +1,7 @@
 {{- $top := . }}
 
 {{- range $name, $data := .Values.dataPlaneIngresses }}
-{{- $fullName := include "inlets-pro-http.fullname" $top -}}
+{{- $fullName := include "inlets-http-server.fullname" $top -}}
 {{- if semverCompare ">=1.14-0" $top.Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
@@ -11,7 +11,7 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}-{{ $name }}
   labels:
-    {{- include "inlets-pro-http.labels" $top | nindent 4 }}
+    {{- include "inlets-http-server.labels" $top | nindent 4 }}
   {{- with .annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -27,7 +27,7 @@ spec:
         paths:
           - path: /
             backend:
-              serviceName: {{ include "inlets-pro-http.fullname" $top }}
+              serviceName: {{ include "inlets-http-server.fullname" $top }}
               servicePort: {{ $top.Values.dataPlane.port }}
 ---
 {{- end }}

chart/http/inlets-http-server/templates/deployment.yaml → chart/inlets-http-server/templates/deployment.yaml

@@ -1,28 +1,28 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "inlets-pro-http.fullname" . }}
+  name: {{ include "inlets-http-server.fullname" . }}
   labels:
-    {{- include "inlets-pro-http.labels" . | nindent 4 }}
+    {{- include "inlets-http-server.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "inlets-pro-http.selectorLabels" . | nindent 6 }}
+      {{- include "inlets-http-server.selectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       labels:
-        {{- include "inlets-pro-http.selectorLabels" . | nindent 8 }}
+        {{- include "inlets-http-server.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "inlets-pro-http.serviceAccountName" . }}
+      serviceAccountName: {{ include "inlets-http-server.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

chart/http/inlets-http-server/templates/service.yaml → chart/inlets-http-server/templates/service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "inlets-pro-http.fullname" . }}
+  name: {{ include "inlets-http-server.fullname" . }}
   labels:
-    {{- include "inlets-pro-http.labels" . | nindent 4 }}
+    {{- include "inlets-http-server.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.serviceType }}
   ports:
@@ -16,4 +16,4 @@ spec:
     protocol: TCP
     targetPort: {{ .Values.dataPlane.port }}
   selector:
-    {{- include "inlets-pro-http.selectorLabels" . | nindent 4 }}
+    {{- include "inlets-http-server.selectorLabels" . | nindent 4 }}