AETHER-2401 move the aether-roc-api-websocket out to its own Helm chart
Change-Id: Ibd6083a124e95e7869486f398b17a37e9c5c3394
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index 84ceaf4..a1381d6 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC API
kubeVersion: ">=1.15.0"
type: application
-version: 1.2.2
+version: 1.2.3
appVersion: v0.8.3
keywords:
- aether
diff --git a/aether-roc-api/templates/deployment.yaml b/aether-roc-api/templates/deployment.yaml
index 32aebb2..cd31a8c 100644
--- a/aether-roc-api/templates/deployment.yaml
+++ b/aether-roc-api/templates/deployment.yaml
@@ -82,38 +82,6 @@
add:
- SYS_PTRACE
{{- end }}
- - name: {{ .Chart.Name }}-websocket
- image: "{{ .Values.image.websocketsidecar.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- args:
- {{- range $key, $corsorigin := .Values.corsOrigins }}
- - {{ printf "-allowCorsOrigin=%s" $corsorigin }}{{end}}
- ports:
- - name: http
- containerPort: {{ .Values.websocketsidecar.port }}
- startupProbe:
- tcpSocket:
- port: {{ .Values.websocketsidecar.port }}
- periodSeconds: 5
- failureThreshold: 60
- readinessProbe:
- tcpSocket:
- port: {{ .Values.websocketsidecar.port }}
- initialDelaySeconds: 10
- periodSeconds: 10
- livenessProbe:
- tcpSocket:
- port: {{ .Values.websocketsidecar.port }}
- initialDelaySeconds: 10
- periodSeconds: 10
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- securityContext: {}
volumes:
- name: secret
secret:
diff --git a/aether-roc-api/templates/service.yaml b/aether-roc-api/templates/service.yaml
index ac60319..9c82225 100644
--- a/aether-roc-api/templates/service.yaml
+++ b/aether-roc-api/templates/service.yaml
@@ -23,26 +23,3 @@
ports:
- name: rest
port: 8181
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "aether-roc-api.fullname" . }}-websocket
- labels:
- app: {{ template "aether-roc-api.fullname" . }}-websocket
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
- {{- include "aether-roc-api.labels" . | nindent 4 }}
-spec:
- type: {{ .Values.service.type }}
- selector:
- name: {{ template "aether-roc-api.fullname" . }}
- app: aether
- type: api
- resource: {{ template "aether-roc-api.fullname" . }}
- {{- include "aether-roc-api.selectorLabels" . | nindent 4 }}
- ports:
- - name: webhook
- port: 80
- targetPort: {{ .Values.websocketsidecar.port }}
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index 8af0bcf..de8daa5 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -13,8 +13,6 @@
tag: v0.8.3
pullPolicy: IfNotPresent
pullSecrets: []
- websocketsidecar:
- repository: onosproject/aether-roc-websocket
imagePullSecrets: []
nameOverride: ""
@@ -29,10 +27,6 @@
openidc:
issuer:
-websocketsidecar:
- enabled: true
- port: 8120
-
store: {}
service: