Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix (validation): deployment and ext access toggle #293

Merged
merged 9 commits into from
Feb 7, 2025
2 changes: 1 addition & 1 deletion charts/extension-manager-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: extension-manager-operator
description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint
type: application
version: 0.22.96
version: 0.23.0
appVersion: "0.113.0"
dependencies:
- name: extension-manager-operator-crds
Expand Down
2 changes: 1 addition & 1 deletion charts/extension-manager-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A Helm chart for extension-manager-operator which manages resources like Content
| crds.enabled | bool | `true` | |
| image.name | string | `"ghcr.io/openmfp/extension-manager-operator"` | |
| image.tag | string | `"0.22.48"` | |
| validationServer.enabled | bool | `false` | enable the validation server |
| istio.enabled | bool | `false` | enable Istio VirtualService |
| validationServer.host | string | `"*"` | host for the validation VirtualService |
| validationServer.port | int | `8088` | port for the validation server |

Expand Down
Binary file modified charts/extension-manager-operator/charts/common-0.2.7.tgz
Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions charts/extension-manager-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ spec:
{{- include "common.PortsMetricsHealth" . | nindent 10 -}}
{{- include "common.operatorHealthAndReadyness" . | nindent 10 -}}
{{- include "common.resources" . | nindent 10 }}
{{- if .Values.validationServer.enabled }}
- args:
- server
image: {{ .Values.image.name }}:{{ .Chart.AppVersion }}
Expand All @@ -49,5 +48,4 @@ spec:
- containerPort: {{ .Values.validationServer.port }}
{{- include "common.PortsMetricsHealth" . | nindent 10 -}}
{{ include "common.operatorHealthAndReadyness" . | nindent 10 }}
{{- end }}
terminationGracePeriodSeconds: {{ include "common.terminationGracePeriodSeconds" .}}
2 changes: 0 additions & 2 deletions charts/extension-manager-operator/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{- if .Values.validationServer.enabled }}
apiVersion: v1
kind: Service
metadata:
Expand All @@ -13,4 +12,3 @@ spec:
- protocol: TCP
port: {{ .Values.validationServer.port }}
targetPort: {{ .Values.validationServer.port }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}}
{{- if .Values.validationServer.enabled }}
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
Expand All @@ -20,4 +19,3 @@ spec:
port:
number: {{ .Values.validationServer.port }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,42 @@ operator match the snapshot:
path: /readyz
port: 8081
periodSeconds: 10
- args:
- server
image: ghcr.io/openmfp/extension-manager-operator:1.0.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 1
httpGet:
path: /readyz
port: 8081
periodSeconds: 10
name: server
ports:
- containerPort: 8088
- containerPort: 8080
name: metrics
protocol: TCP
- containerPort: 8081
name: health-port
protocol: TCP
readinessProbe:
httpGet:
path: /readyz
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
securityContext:
readOnlyRootFilesystem: true
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
startupProbe:
failureThreshold: 30
httpGet:
path: /readyz
port: 8081
periodSeconds: 10
securityContext:
runAsNonRoot: true
seccompProfile:
Expand Down
6 changes: 4 additions & 2 deletions charts/extension-manager-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ crds:
commonAnnotations: {}

validationServer:
# -- enable the validation server
enabled: false
# -- port for the validation server
port: 8088
# -- host for the validation VirtualService
host: "*"

istio:
# -- enable Istio VirtualService
enabled: false