Merge pull request #56 from qpoint-io/marc-barry/endpoints

Update qtap and qtap-operator charts.

charts/qtap-operator/Chart.yaml

@@ -2,6 +2,6 @@ apiVersion: v2
 name: qtap-operator
 description: A Helm chart for a Kubernetes Qtap operator
 type: application
-version: 0.0.12
+version: 0.0.13
 # This is the semantic version of https://github.com/qpoint-io/kubernetes-qtap-operator/releases being deployed
-appVersion: "v0.0.6"
+appVersion: "v0.0.8"

charts/qtap-operator/values.yaml

@@ -48,16 +48,23 @@ controllerManager:
 injectPodAnnotationsConfigmap:
   annotationsYaml: |-
     qpoint.io/inject-ca: "true"
-    qpoint.io/egress-init-tag: "v0.0.8"
-    qpoint.io/qtap-tag: "v0.0.10"
-    qpoint.io/egress-port-mapping: "10080:80,10443:443,10000:"
-    qpoint.io/egress-accept-uids: "1010"
-    qpoint.io/egress-accept-gids: "1010"
-    qpoint.io/log-level: "info"
-    qpoint.io/block-unknown: "false"
-    qpoint.io/dns-lookup-family: "V4_ONLY"
+    qpoint.io/qtap-init-tag: "v0.0.8"
+    qpoint.io/qtap-tag: "v0.0.11"
+    qpoint.io/qtap-init-egress-port-mapping: "10080:80,10443:443"
+    qpoint.io/qtap-init-egress-accept-uids: "1010"
+    qpoint.io/qtap-init-egress-accept-gids: "1010"
     qpoint.io/qtap-uid: "1010"
     qpoint.io/qtap-gid: "1010"
+    qpoint.io/qtap-log-level: "error"
+    qpoint.io/qtap-log-encoding: "json"
+    qpoint.io/qtap-log-caller: "false"
+    qpoint.io/qtap-egress-http-listen: "0.0.0.0:10080"
+    qpoint.io/qtap-egress-https-listen: "0.0.0.0:10443"
+    qpoint.io/qtap-status-listen: "0.0.0.0:10001"
+    qpoint.io/qtap-block-unknown: "false"
+    qpoint.io/qtap-envoy-log-level: "error"
+    qpoint.io/qtap-dns-lookup-family: "V4_ONLY"
+    qpoint.io/qtap-api-endpoint: "https://api.qpoint.io"
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports:
@@ -69,15 +76,15 @@ metricsService:
 servicePodAnnotationsConfigmap:
   annotationsYaml: |-
     qpoint.io/inject-ca: "true"
-    qpoint.io/egress-init-tag: "v0.0.8"
-    qpoint.io/egress-to-domain: "qtap-gateway.qpoint.svc.cluster.local"
-    qpoint.io/egress-port-mapping: "10080:80,10443:443"
+    qpoint.io/qtap-init-tag: "v0.0.8"
+    qpoint.io/qtap-init-egress-to-addr: ""
+    qpoint.io/qtap-init-egress-to-domain: "qtap-gateway.qpoint.svc.cluster.local"
+    qpoint.io/qtap-init-egress-port-mapping: "10080:80,10443:443"
+    qpoint.io/qtap-init-egress-accept-uids: "1010"
+    qpoint.io/qtap-init-egress-accept-gids: "1010"
 webhookService:
   ports:
   - port: 443
     protocol: TCP
     targetPort: 9443
   type: ClusterIP
-
-# API token
-token: ""

charts/qtap/Chart.yaml

@@ -8,10 +8,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.11
+version: 0.0.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.0.10"
+appVersion: "v0.0.11"

charts/qtap/templates/deployment.yaml

@@ -46,15 +46,18 @@ spec:
                 secretKeyRef:
                   name: token
                   key: token
+            - name: EGRESS_HTTP_LISTEN
+              value: "0.0.0.0:{{ .Values.service.egressHttpPort }}"
+            - name: EGRESS_HTTPS_LISTEN
+              value: "0.0.0.0:{{ .Values.service.egressHttpsPort }}"
+            - name: STATUS_LISTEN
+              value: "0.0.0.0:{{ .Values.status.port }}"
           ports:
-            - name: tcp-service
-              containerPort: {{ .Values.service.tcpPort }}
+            - name: egress-http-service
+              containerPort: {{ .Values.service.egressHttpPort }}
               protocol: TCP
-            - name: http-service
-              containerPort: {{ .Values.service.httpPort }}
-              protocol: TCP
-            - name: https-service
-              containerPort: {{ .Values.service.httpsPort }}
+            - name: egress-https-service
+              containerPort: {{ .Values.service.egressHttpsPort }}
               protocol: TCP
             - name: status
               containerPort: {{ .Values.status.port }}

charts/qtap/templates/secret.yaml

@@ -6,4 +6,4 @@ metadata:
 type: Opaque
 data:
   token: {{ .Values.token | b64enc }}
-{{- end }}
+{{- end }}

charts/qtap/templates/service.yaml

@@ -6,16 +6,12 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.tcpPort }}
-      targetPort: tcp-service
+    - port: {{ .Values.service.egressHttpPort }}
+      targetPort: egress-http-service
       protocol: TCP
-      name: tcp-service
-    - port: {{ .Values.service.httpPort }}
-      targetPort: http-service
+      name: egress-http-service
+    - port: {{ .Values.service.egressHttpsPort }}
+      targetPort: egress-https-service
       protocol: TCP
-      name: http-service
-    - port: {{ .Values.service.httpsPort }}
-      targetPort: https-service
-      protocol: TCP
-      name: https-service
+      name: egress-https-service
   selector: {{- include "qtap.selectorLabels" . | nindent 4 }}

charts/qtap/values.yaml

@@ -47,13 +47,12 @@ securityContext:
 
 service:
   type: ClusterIP
-  tcpPort: 10000
-  httpPort: 10080
-  httpsPort: 10443
+  egressHttpPort: 10080
+  egressHttpsPort: 10443
 
 status:
   type: ClusterIP
-  port: 8080
+  port: 10001
 
 resources:
   {}
@@ -95,4 +94,4 @@ tolerations: []
 affinity: {}
 
 # API token
-token: ""
+token: ""