Skip to content

Commit

Permalink
Bumped deploy and results managers, added PVC to test-manager and ssh… (
Browse files Browse the repository at this point in the history 
#35)

Adds:
* PVC to testManager for storing PCAPs
* SSH private key to testManager
* Ingresses for deployManager, resultsManager and testManager

Updates:
* image bumps for configManager, deployManager, resultsManager and testManager
  • Loading branch information
@dblane-digicatapult
dblane-digicatapult authored Nov 9, 2023
1 parent 4bd7a59 commit 57c6f2a
Show file tree
Hide file tree
Showing 19 changed files with 226 additions and 53 deletions.
4 changes: 2 additions & 2 deletions charts/configmanager/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: configmanager
appVersion: 1.1.0
appVersion: 1.1.2
description: A generated Helm Chart for Soniclabs T&M configmanager
version: 1.0.0
version: 1.0.1
type: application
maintainers:
- name: cdecatapult
Expand Down
2 changes: 1 addition & 1 deletion charts/configmanager/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
| ------------------- | ---------------------------------------------------- | --------------------------------------------- |
| `image.repository` | The repository to use for the Config Manager image | `ghcr.io/cdecatapult/soniclabs-configmanager` |
| `image.pullPolicy` | The pull policy to use for the Config Manager image | `Always` |
| `image.tag` | The tag to use for the Config Manager image | `v1.1.0` |
| `image.tag` | The tag to use for the Config Manager image | `v1.1.2` |
| `image.pullSecrets` | The pull secrets to use for the Config Manager image | `["soniclabs"]` |

### ConfigManager Ingress parameters
Expand Down
2 changes: 1 addition & 1 deletion charts/configmanager/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ image:
## @param image.pullPolicy The pull policy to use for the Config Manager image
pullPolicy: Always
## @param image.tag The tag to use for the Config Manager image
tag: v1.1.0
tag: v1.1.2
## @param image.pullSecrets The pull secrets to use for the Config Manager image
pullSecrets: ['soniclabs']

Expand Down
4 changes: 2 additions & 2 deletions charts/deploymanager/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: deploymanager
appVersion: 1.1.0
appVersion: 1.1.2
description: A generated Helm Chart for Soniclabs T&M deploymanager
version: 1.0.0
version: 1.0.1
type: application
maintainers:
- name: cdecatapult
Expand Down
2 changes: 1 addition & 1 deletion charts/deploymanager/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
| ------------------- | ---------------------------------------------------- | --------------------------------------------- |
| `image.repository` | The repository to use for the Deploy Manager image | `ghcr.io/cdecatapult/soniclabs-deploymanager` |
| `image.pullPolicy` | The pull policy to use for the Deploy Manager image | `Always` |
| `image.tag` | The tag to use for the Deploy Manager image | `v1.1.0` |
| `image.tag` | The tag to use for the Deploy Manager image | `v1.1.2` |
| `image.pullSecrets` | The pull secrets to use for the Deploy Manager image | `["soniclabs"]` |

### DeployManager Ingress parameters
Expand Down
35 changes: 35 additions & 0 deletions charts/deploymanager/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{{- if .Values.ingress.enabled }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "deploymanager.fullname" . }}-app
labels:
{{- include "deploymanager.labels" . | nindent 4 }}
{{- if or .Values.ingress.annotations .Values.config.commonAnnotations }}
annotations:
{{- if .Values.ingress.annotations }}
{{- toYaml .Values.ingress.annotations | nindent 4 }}
{{- end }}
{{- if .Values.config.commonAnnotations }}
{{- toYaml .Values.config.commonAnnotations | nindent 4 }}
{{- end }}
{{- end }}
spec:
{{ if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
{{ end }}
rules:
- host: {{ .Values.ingress.hostname }}
http:
paths:
{{- range .Values.ingress.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
{{- end }}
backend:
service:
name: {{ include "deploymanager.fullname" . }}
port:
number: {{ $.Values.config.appPort }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/deploymanager/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ image:
## @param image.pullPolicy The pull policy to use for the Deploy Manager image
pullPolicy: Always
## @param image.tag The tag to use for the Deploy Manager image
tag: v1.1.0
tag: v1.1.2
## @param image.pullSecrets The pull secrets to use for the Deploy Manager image
pullSecrets: ['soniclabs']

Expand Down
4 changes: 2 additions & 2 deletions charts/resultsmanager/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: resultsmanager
appVersion: 1.1.0
appVersion: 1.2.0
description: A generated Helm Chart for Soniclabs T&M resultsmanager
version: 1.0.0
version: 1.0.1
type: application
maintainers:
- name: cdecatapult
Expand Down
2 changes: 1 addition & 1 deletion charts/resultsmanager/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
| ------------------- | ----------------------------------------------------- | ---------------------------------------------- |
| `image.repository` | The repository to use for the Results Manager image | `ghcr.io/cdecatapult/soniclabs-resultsmanager` |
| `image.pullPolicy` | The pull policy to use for the Results Manager image | `Always` |
| `image.tag` | The tag to use for the Results Manager image | `v1.1.0` |
| `image.tag` | The tag to use for the Results Manager image | `v1.2.0` |
| `image.pullSecrets` | The pull secrets to use for the Results Manager image | `["soniclabs"]` |

### ResultsManager Ingress parameters
Expand Down
35 changes: 35 additions & 0 deletions charts/resultsmanager/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{{- if .Values.ingress.enabled }}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ include "resultsmanager.fullname" . }}-app
labels:
{{- include "resultsmanager.labels" . | nindent 4 }}
{{- if or .Values.ingress.annotations .Values.config.commonAnnotations }}
annotations:
{{- if .Values.ingress.annotations }}
{{- toYaml .Values.ingress.annotations | nindent 4 }}
{{- end }}
{{- if .Values.config.commonAnnotations }}
{{- toYaml .Values.config.commonAnnotations | nindent 4 }}
{{- end }}
{{- end }}
spec:
{{ if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
{{ end }}
rules:
- host: {{ .Values.ingress.hostname }}
http:
paths:
{{- range .Values.ingress.paths }}
- path: {{ .path }}
pathType: {{ .pathType }}
{{- end }}
backend:
service:
name: {{ include "resultsmanager.fullname" . }}
port:
number: {{ $.Values.config.appPort }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/resultsmanager/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ image:
## @param image.pullPolicy The pull policy to use for the Results Manager image
pullPolicy: Always
## @param image.tag The tag to use for the Results Manager image
tag: v1.1.0
tag: v1.2.0
## @param image.pullSecrets The pull secrets to use for the Results Manager image
pullSecrets: ['soniclabs']

Expand Down
4 changes: 2 additions & 2 deletions charts/testmanager/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: testmanager
appVersion: 0.0.11
appVersion: 0.1.4
description: A generated Helm Chart for Soniclabs T&M testmanager
version: 1.0.0
version: 1.0.1
type: application
maintainers:
- name: cdecatapult
Expand Down
66 changes: 37 additions & 29 deletions charts/testmanager/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,49 @@

### TestManager Parameters

| Name | Description | Value |
| -------------------------- | ----------------------------------------------------------------------- | ---------------- |
| `config.replicaCount` | The amount of containers to run | `1` |
| `config.type` | The type of service to create | `LoadBalancer` |
| `config.appPort` | The port to expose the service and application on | `8000` |
| `config.nodePort` | The nodePort to use if the the service type is LoadBalancer or NodePort | `30342` |
| `config.commonAnnotations` | The annotations to set on the Test Manager application | `{}` |
| `config.debug` | Whether or not to enable debug mode for the application | `False` |
| `config.logLevel` | The log level to use for the application | `debug` |
| `config.gui.host` | The hostname of the GUI service | `portal` |
| `config.gui.port` | The port of the GUI service | `8000` |
| `config.sma.host` | The hostname of the Suite Manager service | `suitemanager` |
| `config.sma.port` | The port of the Suite Manager service | `8000` |
| `config.cma.host` | The hostname of the Config Manager service | `configmanager` |
| `config.cma.port` | The port of the Config Manager service | `8000` |
| `config.rma.host` | The hostname of the Results Manager service | `resultsmanager` |
| `config.rma.port` | The port of the Results Manager service | `8000` |
| `config.apg.host` | The hostname of the API Gateway service | `apigateway` |
| `config.apg.port` | The port of the API Gateway service | `8000` |
| `config.dma.host` | The hostname of the Deploy Manager service | `deploymanager` |
| `config.dma.port` | The port of the Deploy Manager service | `8000` |
| `config.controlHost` | The hostname for the the Control TMA Host | `example` |
| `config.controlShare` | The name of the Samba Sharename on the Control TMA Host | `Public` |
| `config.controlUsername` | The username to use for the Control TMA Host | `username` |
| `config.controlPassword` | The password to use for the Control TMA Host | `password` |
| Name | Description | Value |
| ------------------------------------- | ----------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
| `config.replicaCount` | The amount of containers to run | `1` |
| `config.type` | The type of service to create | `LoadBalancer` |
| `config.appPort` | The port to expose the service and application on | `8000` |
| `config.nodePort` | The nodePort to use if the the service type is LoadBalancer or NodePort | `30342` |
| `config.commonAnnotations` | The annotations to set on the Test Manager application | `{}` |
| `config.debug` | Whether or not to enable debug mode for the application | `False` |
| `config.logLevel` | The log level to use for the application | `debug` |
| `config.rtcPort` | The port of the Viavi RTC | `5099` |
| `config.tmaPath` | The path on the "Control Host" to use to execute the TMA. | `C:/Program Files (x86)/VIAVI/TM500/5G NR - NLA 6.16.0/Test Mobile Application/` |
| `config.sshKey` | The SSH key to use for accessing ORAN components | `blahblah
blahblahblah
blahblahblahblah
` |
| `config.pcapStorage.accessMode` | The access mode to use for the PCAP storage PVC | `ReadWriteMany` |
| `config.pcapStorage.path` | The path to use for the PCAP storage PVC | `/mnt/pcaps` |
| `config.pcapStorage.size` | The size to use for the PCAP storage PVC | `10Gi` |
| `config.pcapStorage.storageClassName` | The storage class to use for the PCAP storage PVC | `azureFile` |
| `config.gui.host` | The hostname of the GUI service | `portal` |
| `config.gui.port` | The port of the GUI service | `8000` |
| `config.sma.host` | The hostname of the Suite Manager service | `suitemanager` |
| `config.sma.port` | The port of the Suite Manager service | `8000` |
| `config.cma.host` | The hostname of the Config Manager service | `configmanager` |
| `config.cma.port` | The port of the Config Manager service | `8000` |
| `config.rma.host` | The hostname of the Results Manager service | `resultsmanager` |
| `config.rma.port` | The port of the Results Manager service | `8000` |
| `config.apg.host` | The hostname of the API Gateway service | `apigateway` |
| `config.apg.port` | The port of the API Gateway service | `8000` |
| `config.dma.host` | The hostname of the Deploy Manager service | `deploymanager` |
| `config.dma.port` | The port of the Deploy Manager service | `8000` |
| `config.controlHost` | The hostname for the the Control TMA Host | `example` |
| `config.controlShare` | The name of the Samba Sharename on the Control TMA Host | `Public` |
| `config.controlUsername` | The username to use for the Control TMA Host | `username` |
| `config.controlPassword` | The password to use for the Control TMA Host | `password` |

### TestManager Image Parameters

| Name | Description | Value |
| ------------------- | -------------------------------------------------- | ---------------------------------------------- |
| `image.repository` | The repository to use for the Test Manager image | `ghcr.io/cdecatapult/soniclabs-testmanager-ts` |
| `image.pullPolicy` | The pull policy to use for the Test Manager image | `Always` |
| `image.tag` | The tag to use for the Test Manager image | `v0.0.12` |
| `image.tag` | The tag to use for the Test Manager image | `v0.1.5` |
| `image.pullSecrets` | The pull secrets to use for the Test Manager image | `["soniclabs"]` |

### TestManager Ingress parameters
Expand All @@ -48,10 +58,8 @@
| `ingress.ingressClassName` | The ingress class to use for the Test Manager application | `""` |
| `ingress.hostname` | The hostname to use for the Test Manager application | `testmanager.local` |
| `ingress.paths` | The paths to use for the Test Manager application | |
| `ingress.paths[0].path` | The path to use for IoT tests in the Test Manager application | `/iot` |
| `ingress.paths[0].path` | The path to use for IoT tests in the Test Manager application | `/api/tma` |
| `ingress.paths[0].pathType` | The path type to use for Iot tests in the Test Manager application | `Prefix` |
| `ingress.paths[1].path` | The path to use for E2E tests in the Test Manager application | `/e2e` |
| `ingress.paths[1].pathType` | The path type to use for E2E tests in the Test Manager application | `Prefix` |

### TestManager ServiceAccount parameters

Expand Down
4 changes: 4 additions & 0 deletions charts/testmanager/ci/ct-values.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
config:
type: ClusterIP
pcapStorage:
accessMode: ReadWriteOnce
size: 1Gi
storageClassName: "standard"
Loading

0 comments on commit 57c6f2a

Please sign in to comment.