Added back james token and jmap endpoint. Renamed the endpoints

Signed-off-by: sami <[email protected]>
ops-center · Jul 12, 2024 · c570ba5 · c570ba5
1 parent 8665aeb
commit c570ba5
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/apis/installer/v1alpha1/inbox_agent_types.go b/apis/installer/v1alpha1/inbox_agent_types.go
@@ -96,8 +96,9 @@ type InboxAgentApiserver struct {
 }
 
 type InboxServerInfo struct {
-	JMAPEndpoint     string `json:"jmapendpoint"`
-	WebadminEndpoint string `json:"webadminendpoint"`
+	JMAPEndpoint     string `json:"jmapEndpoint"`
+	WebadminEndpoint string `json:"webadminEndpoint"`
+	Token            string `json:"token"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/charts/inbox-agent/README.md b/charts/inbox-agent/README.md
@@ -89,7 +89,8 @@ The following table lists the configurable parameters of the `inbox-agent` chart
 | apiserver.servingCerts.serverKey      | Private key for the serving certificate used by webhook server.                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | monitoring.agent                      | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin")                                                                                                                                                             | <code>"none"</code>                                                                                                                                                                            |
 | monitoring.serviceMonitor.labels      | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`.                                                                               | <code>{}</code>                                                                                                                                                                                |
-| inboxServer.endpoint                  |                                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
+| inboxServer.jmapEndpoint              |                                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
+| inboxServer.webadminEndpoint          |                                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 | inboxServer.token                     |                                                                                                                                                                                                                                                   | <code>""</code>                                                                                                                                                                                |
 
 

diff --git a/charts/inbox-agent/templates/operator/config.yaml b/charts/inbox-agent/templates/operator/config.yaml
@@ -7,5 +7,6 @@ metadata:
     {{- include "inbox-agent.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  jmapendpoint: {{ .Values.inboxServer.jmapendpoint }}
-  webadminendpoint: {{ .Values.inboxServer.webadminendpoint }}
+  jmapEndpoint: {{ .Values.inboxServer.jmapEndpoint }}
+  webadminEndpoint: {{ .Values.inboxServer.webadminEndpoint }}
+  token: {{.Values.inboxServer.token}}
diff --git a/charts/inbox-agent/templates/operator/deployment.yaml b/charts/inbox-agent/templates/operator/deployment.yaml
@@ -78,12 +78,12 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ include "inbox-agent.fullname" . }}-config
-              key: webadminendpoint
-        - name: INBOX_SERVER_JMAP_ENDPOINT
+              key: webadminEndpoint
+        - name: INBOX_SERVER_TOKEN
           valueFrom:
             secretKeyRef:
               name: {{ include "inbox-agent.fullname" . }}-config
-              key: jmapendpoint
+              key: token
       {{- if .Values.apiserver.healthcheck.enabled }}
         readinessProbe:
           httpGet:

diff --git a/charts/inbox-agent/templates/webhook/deployment.yaml b/charts/inbox-agent/templates/webhook/deployment.yaml
@@ -69,16 +69,21 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: INBOX_SERVER_WEBADMIN_ENDPOINT
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "inbox-agent.fullname" . }}-config
+              key: webadminEndpoint
         - name: INBOX_SERVER_JMAP_ENDPOINT
           valueFrom:
             secretKeyRef:
               name: {{ include "inbox-agent.fullname" . }}-config
-              key: jmapendpoint
-        - name: INBOX_SERVER_WEBADMIN_ENDPOINT
+              key: jmapEndpoint
+        - name: INBOX_SERVER_TOKEN
           valueFrom:
             secretKeyRef:
               name: {{ include "inbox-agent.fullname" . }}-config
-              key: webadminendpoint
+              key: token
         ports:
         - name: webhook-server
           containerPort: 9443

diff --git a/charts/inbox-agent/values.openapiv3_schema.yaml b/charts/inbox-agent/values.openapiv3_schema.yaml
@@ -945,13 +945,16 @@ properties:
     type: array
   inboxServer:
     properties:
-      webadminendpoint:
+      jmapEndpoint:
         type: string
-      jmapendpoint:
+      token:
+        type: string
+      webadminEndpoint:
         type: string
     required:
-    - webadminendpoint
-    - jmapendpoint
+    - jmapEndpoint
+    - token
+    - webadminEndpoint
     type: object
   logLevel:
     format: int32

diff --git a/charts/inbox-agent/values.yaml b/charts/inbox-agent/values.yaml
@@ -137,5 +137,6 @@ monitoring:
     labels: {}
 
 inboxServer:
-  jmapendpoint: ""
-  webadminendpoint: ""
+  jmapEndpoint: ""
+  webadminEndpoint: ""
+  token: ""