Merge pull request #3 from ops-center/remove-env-jwttoken

Added JMAP and Webadmin endpoints as env variables.
ops-center · Aug 6, 2024 · 2423ac6 · 2423ac6
2 parents 6bc40c9 + 67e0549
commit 2423ac6
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 18 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 {
-	Endpoint string `json:"endpoint"`
-	Token    string `json:"token"`
+	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:
-  endpoint: {{ .Values.inboxServer.endpoint }}
-  token: {{ .Values.inboxServer.token }}
+  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
@@ -57,12 +57,18 @@ spec:
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
         args:
-          - operator
-          - --v={{ .Values.logLevel }}
-          - --secure-port=8443
-          - --audit-log-path=-
-          - --tls-cert-file=/var/serving-cert/tls.crt
-          - --tls-private-key-file=/var/serving-cert/tls.key
+        - operator
+        - --v={{ .Values.logLevel }}
+        - --secure-port=8443
+        - --audit-log-path=-
+        - --tls-cert-file=/var/serving-cert/tls.crt
+        - --tls-private-key-file=/var/serving-cert/tls.key
+      {{- if .Values.inboxServer.jmapEndpoint }}
+        - --jmapEndpoint={{ .Values.inboxServer.jmapEndpoint }}
+      {{- end }}
+      {{- if .Values.inboxServer.webadminEndpoint }}
+        - --webadminEndpoint={{ .Values.inboxServer.webadminEndpoint }}
+      {{- end }}
         ports:
         - containerPort: 8443
         env:
@@ -78,7 +84,12 @@ spec:
           valueFrom:
             secretKeyRef:
               name: {{ include "inbox-agent.fullname" . }}-config
-              key: endpoint
+              key: jmapEndpoint
+        - name: INBOX_SERVER_WEBADMIN_ENDPOINT
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "inbox-agent.fullname" . }}-config
+              key: webadminEndpoint
         - name: INBOX_SERVER_TOKEN
           valueFrom:
             secretKeyRef:

diff --git a/charts/inbox-agent/templates/webhook/deployment.yaml b/charts/inbox-agent/templates/webhook/deployment.yaml
@@ -58,8 +58,14 @@ spec:
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
         args:
-          - webhook
-          - --webhook-name={{ include "inbox-agent.fullname" . }}
+        - webhook
+        - --webhook-name={{ include "inbox-agent.fullname" . }}
+      {{- if .Values.inboxServer.jmapEndpoint }}
+        - --jmapEndpoint={{ .Values.inboxServer.jmapEndpoint }}
+      {{- end }}
+      {{- if .Values.inboxServer.webadminEndpoint }}
+        - --webadminEndpoint={{ .Values.inboxServer.webadminEndpoint }}
+      {{- end }}
         env:
         - name: POD_NAME
           valueFrom:
@@ -69,11 +75,16 @@ 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: endpoint
+              key: jmapEndpoint
         - name: INBOX_SERVER_TOKEN
           valueFrom:
             secretKeyRef:

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:
-      endpoint:
+      jmapEndpoint:
         type: string
       token:
         type: string
+      webadminEndpoint:
+        type: string
     required:
-    - endpoint
+    - 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:
-  endpoint: ""
+  jmapEndpoint: ""
+  webadminEndpoint: ""
   token: ""