Merge pull request #73 from kube-tarian/helm-bridge

feat: Support for git & container bridge

README.md

@@ -61,9 +61,30 @@ helm upgrade -i kubviz-client kubviz/client -n kubviz --set "nats.auth.token=$to
     ```
 
 #### Agent Installation
+
+##### Deploying Agent on the Same Kubernetes Cluster as kubeviz Client:
+1. Make sure you have the kubeviz client running on your Kubernetes cluster.
+2. Run the following command to deploy the kubeviz agent:
+
+```bash
+helm upgrade -i kubviz-agent kubviz/agent -n kubviz \
+  --set nats.host=<NATS IP ADDRESS> \
+  --set "nats.auth.token=$token" \
+  --set git_bridge.enabled=true \
+  --set "git_bridge.ingress.hosts[0].host=<INGRESS HOSTNAME>",git_bridge.ingress.hosts[0].paths[0].path=/ \
+  --set container_bridge.enabled=true \
+  --set "container_bridge.ingress.hosts[0].host=<INGRESS HOSTNAME>",container_bridge.ingress.hosts[0].paths[0].path=/
+```
+3. Replace "NATS IP ADDRESS" with the IP address of your NATS server.
+4. Replace "INGRESS HOSTNAME" with the desired hostname for the Git Bridge and Container Bridge Ingress configurations.
+
+##### Deploying Agent on a Different Kubernetes Cluster:
+1. Run the following command to deploy the kubeviz agent:
 ```bash
-helm upgrade -i kubviz-agent kubviz/agent -n kubviz --set nats.host=<NATS IP Address> --set "nats.auth.token=$token"
+helm upgrade -i kubviz-agent kubviz/agent -n kubviz --set nats.host=<NATS IP Address> --set "nats.auth.token=$token"  
 ```
+2. Replace "NATS IP Address" with the IP address of your NATS server.
+
 ## Use Cases
 
 ### Cluster Event Tracking

charts/agent/Chart.yaml

@@ -15,7 +15,7 @@ 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.1.6
+version: 0.1.7
 
 # 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

charts/agent/templates/deployment.yaml

@@ -35,7 +35,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
 #          livenessProbe:
 #            httpGet:
@@ -54,6 +54,28 @@ spec:
             value: {{ .Values.nats.host }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if .Values.git_bridge.enabled }}
+        - name: git-bridge
+          image: "{{ .Values.git_bridge.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.container_bridge.image.pullPolicy }}
+          ports:
+            - name: http-git
+              containerPort: 8081
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.git_bridge.resources | nindent 12 }}
+{{- end }}
+{{- if .Values.container_bridge.enabled }}
+        - name: container-bridge
+          image: "{{ .Values.container_bridge.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.container_bridge.image.pullPolicy }}
+          ports:
+            - name: http-container
+              containerPort: 8082
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.container_bridge.resources | nindent 12 }}
+{{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/agent/templates/ingress_bridge.yaml

@@ -0,0 +1,43 @@
+{{- if .Values.container_bridge.enabled }}
+{{- if .Values.container_bridge.ingress.enabled -}}
+{{- $fullName := include "agent.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-container
+  labels:
+    {{- include "agent.labels" . | nindent 4 }}
+  {{- with .Values.container_bridge.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.container_bridge.ingress.tls }}
+  tls:
+    {{- range .Values.container_bridge.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.container_bridge.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ $fullName }}-container
+              servicePort: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/agent/templates/ingress_git.yaml

@@ -0,0 +1,43 @@
+{{- if .Values.git_bridge.enabled }}
+{{- if .Values.container_bridge.ingress.enabled -}}
+{{- $fullName := include "agent.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "agent.labels" . | nindent 4 }}
+  {{- with .Values.git_bridge.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.git_bridge.ingress.tls }}
+  tls:
+    {{- range .Values.git_bridge.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.git_bridge.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ $fullName }}-git
+              servicePort: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+  {{- end }}
+  {{- end }}

charts/agent/templates/service_container_bridge.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.container_bridge.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "agent.fullname" . }}-container
+  labels:
+    {{- include "agent.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http-container
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "agent.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/agent/templates/service_git_bridge.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.git_bridge.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "agent.fullname" . }}-git
+  labels:
+    {{- include "agent.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http-git
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "agent.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/agent/values.yaml

@@ -42,6 +42,62 @@ service:
   type: ClusterIP
   port: 80
 
+git_bridge:
+  enabled: false
+  image:
+    repository: ghcr.io/kube-tarian/kubviz
+    pullPolicy: Always
+    tag: "latest"
+  resources: 
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ingress:
+    enabled: true
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: gitbridge.local
+        paths:
+          - path: /
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - chart-example.local
+
+
+
+container_bridge:
+  enabled: false
+  image:
+    repository: ghcr.io/kube-tarian/kubviz
+    pullPolicy: Always
+    tag: "latest"
+  resources: 
+     limits:
+       cpu: 100m
+       memory: 128Mi
+     requests:
+       cpu: 100m
+       memory: 128Mi
+  ingress:
+    enabled: true
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    hosts:
+      - host: containerbridge.local
+        paths:
+          - path: /
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - chart-example.local
+
 ingress:
   enabled: false
   annotations: {}