From 51c079588a5126a6e774ce6bbe59e20bdd2f4391 Mon Sep 17 00:00:00 2001 From: Marc Barry <4965634+marc-barry@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:41:07 -0500 Subject: [PATCH] Update qtap and qtap-operator charts. --- charts/qtap-operator/Chart.yaml | 4 +-- charts/qtap-operator/values.yaml | 35 ++++++++++++++++----------- charts/qtap/Chart.yaml | 4 +-- charts/qtap/templates/deployment.yaml | 17 +++++++------ charts/qtap/templates/secret.yaml | 2 +- charts/qtap/templates/service.yaml | 16 +++++------- charts/qtap/values.yaml | 9 +++---- 7 files changed, 46 insertions(+), 41 deletions(-) diff --git a/charts/qtap-operator/Chart.yaml b/charts/qtap-operator/Chart.yaml index f9ebed6..485862e 100644 --- a/charts/qtap-operator/Chart.yaml +++ b/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" diff --git a/charts/qtap-operator/values.yaml b/charts/qtap-operator/values.yaml index 02f627d..0b66922 100644 --- a/charts/qtap-operator/values.yaml +++ b/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: "" diff --git a/charts/qtap/Chart.yaml b/charts/qtap/Chart.yaml index cc39636..c8c6f58 100644 --- a/charts/qtap/Chart.yaml +++ b/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" diff --git a/charts/qtap/templates/deployment.yaml b/charts/qtap/templates/deployment.yaml index fccb334..e173e7b 100644 --- a/charts/qtap/templates/deployment.yaml +++ b/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 }} diff --git a/charts/qtap/templates/secret.yaml b/charts/qtap/templates/secret.yaml index 4a2bfec..bc9dc85 100644 --- a/charts/qtap/templates/secret.yaml +++ b/charts/qtap/templates/secret.yaml @@ -6,4 +6,4 @@ metadata: type: Opaque data: token: {{ .Values.token | b64enc }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/qtap/templates/service.yaml b/charts/qtap/templates/service.yaml index 9ec66c0..46c6498 100644 --- a/charts/qtap/templates/service.yaml +++ b/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 }} diff --git a/charts/qtap/values.yaml b/charts/qtap/values.yaml index 6cb6a28..d073db5 100644 --- a/charts/qtap/values.yaml +++ b/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: "" \ No newline at end of file +token: ""