Update the qtap-operator type to support the new functionality for labelling and injection

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.7
+version: 0.0.8
 # This is the semantic version of https://github.com/qpoint-io/kubernetes-qtap-operator/releases being deployed
-appVersion: "v0.0.4"
+appVersion: "v0.0.5"

charts/qtap-operator/templates/deployment.yaml

@@ -27,6 +27,8 @@ spec:
         command:
         - /manager
         env:
+        - name: ENDPOINT
+          value: {{ quote .Values.controllerManager.manager.env.endpoint }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag

charts/qtap-operator/templates/inject-pod-annotations-configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "qtap-operator.fullname" . }}-inject-pod-annotations-configmap
+  labels:
+  {{- include "qtap-operator.labels" . | nindent 4 }}
+data:
+  annotations.yaml: {{ .Values.injectPodAnnotationsConfigmap.annotationsYaml | toYaml
+    | indent 1 }}

charts/qtap-operator/templates/manager-cluster-rbac.yaml

@@ -0,0 +1,43 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "qtap-operator.fullname" . }}-manager-cluster-role
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: qtap-operator
+    app.kubernetes.io/part-of: qtap-operator
+  {{- include "qtap-operator.labels" . | nindent 4 }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - watch

charts/qtap-operator/templates/manager-clusterrolebinding-rbac.yaml

@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "qtap-operator.fullname" . }}-manager-clusterrolebinding
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: qtap-operator
+    app.kubernetes.io/part-of: qtap-operator
+  {{- include "qtap-operator.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: '{{ include "qtap-operator.fullname" . }}-manager-cluster-role'
+subjects:
+- kind: ServiceAccount
+  name: '{{ include "qtap-operator.fullname" . }}-controller-manager'
+  namespace: '{{ .Release.Namespace }}'

charts/qtap-operator/templates/manager-rbac.yaml

@@ -1,5 +1,5 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
   name: {{ include "qtap-operator.fullname" . }}-manager-role
   labels:
@@ -11,31 +11,23 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
+  - configmaps
   verbs:
   - get
   - list
   - watch
+  - create
 - apiGroups:
   - ""
   resources:
-  - configmaps
+  - secrets
   verbs:
   - get
   - list
   - watch
-  - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
 metadata:
   name: {{ include "qtap-operator.fullname" . }}-manager-rolebinding
   labels:
@@ -45,7 +37,7 @@ metadata:
   {{- include "qtap-operator.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: '{{ include "qtap-operator.fullname" . }}-manager-role'
 subjects:
 - kind: ServiceAccount

charts/qtap-operator/templates/secret.yaml

@@ -0,0 +1,9 @@
+{{- if .Values.token }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: token
+type: Opaque
+data:
+  token: {{ .Values.token | b64enc }}
+{{- end }}

charts/qtap-operator/templates/default-pod-annotations-configmap.yaml → charts/qtap-operator/templates/service-pod-annotations-configmap.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "qtap-operator.fullname" . }}-default-pod-annotations-configmap
+  name: {{ include "qtap-operator.fullname" . }}-service-pod-annotations-configmap
   labels:
   {{- include "qtap-operator.labels" . | nindent 4 }}
 data:
-  annotations.yaml: {{ .Values.defaultPodAnnotationsConfigmap.annotationsYaml | toYaml
+  annotations.yaml: {{ .Values.servicePodAnnotationsConfigmap.annotationsYaml | toYaml
     | indent 1 }}

charts/qtap-operator/values.yaml

@@ -30,8 +30,11 @@ controllerManager:
       capabilities:
         drop:
         - ALL
+    env:
+      endpoint: https://api.qpoint.io
     image:
       repository: us-docker.pkg.dev/qpoint-edge/public/kubernetes-qtap-operator
+      tag: latest
     imagePullPolicy: IfNotPresent
     resources:
       limits:
@@ -43,12 +46,15 @@ controllerManager:
   replicas: 1
   serviceAccount:
     annotations: {}
-defaultPodAnnotationsConfigmap:
+injectPodAnnotationsConfigmap:
   annotationsYaml: |-
     qpoint.io/inject-ca: "true"
     qpoint.io/egress-init-tag: "v0.0.7"
-    qpoint.io/egress-to-domain: "qtap-gateway.qpoint.svc.cluster.local"
-    qpoint.io/egress-port-mapping: "10080:80,10443:443"
+    qpoint.io/qtap-tag: "v0.0.10"
+    qpoint.io/egress-port-mapping: "10080:80,10443:443,10000:"
+    qpoint.io/log-level: "info"
+    qpoint.io/block-unknown: "false"
+    qpoint.io/dns-lookup-family: "V4_ONLY"
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports:
@@ -57,9 +63,19 @@ metricsService:
     protocol: TCP
     targetPort: https
   type: ClusterIP
+servicePodAnnotationsConfigmap:
+  annotationsYaml: |-
+    qpoint.io/inject-ca: "true"
+    qpoint.io/egress-init-tag: "v0.0.7"
+    qpoint.io/egress-to-domain: "qtap-gateway.qpoint.svc.cluster.local"
+    qpoint.io/egress-port-mapping: "10080:80,10443:443"
 webhookService:
   ports:
   - port: 443
     protocol: TCP
     targetPort: 9443
   type: ClusterIP
+
+
+# API token
+token: ""