From d14f8b003cc243a041ae163fe9bf5f56b8c00271 Mon Sep 17 00:00:00 2001 From: sami Date: Wed, 10 Jul 2024 16:49:58 +0600 Subject: [PATCH 1/2] Added JMAP and Webadmin endpoints. Signed-off-by: sami --- apis/installer/v1alpha1/inbox_agent_types.go | 5 +++-- charts/inbox-agent/README.md | 3 ++- charts/inbox-agent/templates/operator/config.yaml | 5 +++-- charts/inbox-agent/templates/operator/deployment.yaml | 7 ++++++- charts/inbox-agent/templates/webhook/deployment.yaml | 7 ++++++- charts/inbox-agent/values.openapiv3_schema.yaml | 7 +++++-- charts/inbox-agent/values.yaml | 3 ++- 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/apis/installer/v1alpha1/inbox_agent_types.go b/apis/installer/v1alpha1/inbox_agent_types.go index 634c6e6..6358fc7 100644 --- 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 index be1cec0..a9877ce 100644 --- 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. | "" | | monitoring.agent | Name of monitoring agent (either "prometheus.io/operator" or "prometheus.io/builtin") | "none" | | 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`. | {} | -| inboxServer.endpoint | | "" | +| inboxServer.jmapEndpoint | | "" | +| inboxServer.webadminEndpoint | | "" | | inboxServer.token | | "" | diff --git a/charts/inbox-agent/templates/operator/config.yaml b/charts/inbox-agent/templates/operator/config.yaml index d67b3eb..f1f922a 100644 --- 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 index 39bbc5b..54ade6d 100644 --- a/charts/inbox-agent/templates/operator/deployment.yaml +++ b/charts/inbox-agent/templates/operator/deployment.yaml @@ -78,7 +78,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 index 82bbb2d..5821ae4 100644 --- a/charts/inbox-agent/templates/webhook/deployment.yaml +++ b/charts/inbox-agent/templates/webhook/deployment.yaml @@ -69,11 +69,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 index 4ec2af8..3de1755 100644 --- 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 index 8a152a7..44e4adb 100644 --- a/charts/inbox-agent/values.yaml +++ b/charts/inbox-agent/values.yaml @@ -137,5 +137,6 @@ monitoring: labels: {} inboxServer: - endpoint: "" + jmapEndpoint: "" + webadminEndpoint: "" token: "" From 2ea60ef0106b2a59540cea4c7a79dec7705e2e62 Mon Sep 17 00:00:00 2001 From: sohan Date: Wed, 17 Jul 2024 13:51:16 +0600 Subject: [PATCH 2/2] added new arg in webhook deployment and operator deployment Signed-off-by: sohan --- .../templates/operator/deployment.yaml | 18 ++++++++++++------ .../templates/webhook/deployment.yaml | 10 ++++++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/charts/inbox-agent/templates/operator/deployment.yaml b/charts/inbox-agent/templates/operator/deployment.yaml index 54ade6d..0086a92 100644 --- 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: diff --git a/charts/inbox-agent/templates/webhook/deployment.yaml b/charts/inbox-agent/templates/webhook/deployment.yaml index 5821ae4..dfb3c61 100644 --- 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: