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.

Sign up for GitHub

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

Changes giles instances #28

Merged
merged 7 commits into from
Aug 22, 2024
Merged

Changes giles instances #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6f7ba31
Use globals for opis
marcelldls Aug 19, 2024
b6568ad
Use globals for epics-pvcs
marcelldls Aug 19, 2024
7d50cc1
Work on IOC-Instance globals
marcelldls Aug 19, 2024
4f093e2
Allow local ioc_group definition
marcelldls Aug 20, 2024
ac1dae2
Reflect ioc_group schema with uptodate meaning
marcelldls Aug 20, 2024
d759679
Update opis, pvcs values
marcelldls Aug 20, 2024
0cda4dd
Fix comment which causes error
marcelldls Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Charts/epics-opis/templates/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{{- $location := default .Values.global.location .Values.location | required "ERROR - You must supply location or global.location" -}}
{{- $ioc_group := default .Values.global.ioc_group .Values.ioc_group | required "ERROR - You must supply ioc_group or global.ioc_group" -}}
{{- $opisClaim := default (print $ioc_group "-opi-claim") .Values.opisClaim -}}

kind: Deployment
apiVersion: apps/v1
metadata:
name: {{ .Release.Name }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
replicas: 1
selector:
Expand All @@ -15,8 +19,8 @@ spec:
metadata:
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
annotations:
{{ if and .Values.global .Values.global.files -}}
{{- range $k, $v := .Values.global.files }}
Expand All @@ -27,7 +31,7 @@ spec:
volumes:
- name: html-volume
persistentVolumeClaim:
claimName: {{ .Values.ioc_group }}-opi-claim
claimName: {{ $opisClaim }}
- name: config-volume
configMap:
name: {{ .Release.Name }}-nginx-config
Expand Down Expand Up @@ -68,8 +72,8 @@ metadata:
name: {{ .Release.Name }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
type: LoadBalancer
ports:
Expand Down
5 changes: 2 additions & 3 deletions Charts/epics-opis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# use nginx for publishing opi files over http
image: nginx:1.25.4

# the name of the repository in which the IOC is grouped
# Short name for this collection of services
ioc_group:
# the location where the IOCs will run
# location where these IOCs and services will run
location:
31 changes: 19 additions & 12 deletions Charts/epics-pvcs/templates/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
{{- $location := default .Values.global.location .Values.location | required "ERROR - You must supply location or global.location" -}}
{{- $ioc_group := default .Values.global.ioc_group .Values.ioc_group | required "ERROR - You must supply ioc_group or global.ioc_group" -}}
{{- $opisClaim := default (print $ioc_group "-opi-claim") .Values.opisClaim -}}
{{- $runtimeClaim := default (print $ioc_group "-runtime-claim") .Values.runtimeClaim -}}
{{- $autosaveClaim := default (print $ioc_group "-autosave-claim") .Values.autosaveClaim -}}
{{- $binariesClaim := default (print $ioc_group "-binaries-claim") .Values.binariesClaim -}}

# PVC for shared OPI files
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.ioc_group }}-opi-claim
name: {{ $opisClaim }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
accessModes:
- ReadWriteMany
Expand All @@ -18,11 +25,11 @@ spec:
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.ioc_group }}-runtime-claim
name: {{ $runtimeClaim }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
accessModes:
- ReadWriteMany
Expand All @@ -34,11 +41,11 @@ spec:
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.ioc_group }}-autosave-claim
name: {{ $autosaveClaim }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
accessModes:
- ReadWriteMany
Expand All @@ -51,11 +58,11 @@ spec:
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ .Values.ioc_group }}-binaries-claim
name: {{ $binariesClaim }}
labels:
app: {{ .Release.Name }}
location: {{ .Values.location }}
ioc_group: {{ .Values.ioc_group }}
location: {{ $location }}
ioc_group: {{ $ioc_group }}
spec:
accessModes:
- ReadWriteMany
Expand Down
5 changes: 2 additions & 3 deletions Charts/epics-pvcs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# the name of the repository in which the IOC is grouped
# Short name for this collection of services
ioc_group:
# the location where the IOCs will run
# location where these IOCs and services will run
location:

# sizes of the auto provisioned PVs
opi_size: 1Gi
runtime_size: 1Gi
Expand Down
4 changes: 2 additions & 2 deletions Charts/ioc-instance/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Default the derivable substitution values.
This keeps the length of the values.txt file for each individual IOC
to a minimum
*/ -}}
{{- $location := default .Values.global.location .Values.location | required "ERROR - You must supply location." -}}
{{- $ioc_group := default .Values.ioc_group $location -}}
{{- $location := default .Values.global.location .Values.location | required "ERROR - You must supply location or global.location" -}}
{{- $ioc_group := default .Values.global.ioc_group .Values.ioc_group | required "ERROR - You must supply ioc_group or global.ioc_group" -}}
{{- $opisClaim := default (print $ioc_group "-opi-claim") .Values.opisClaim -}}
{{- $runtimeClaim := default (print $ioc_group "-runtime-claim") .Values.runtimeClaim -}}
{{- $autosaveClaim := default (print $ioc_group "-autosave-claim") .Values.autosaveClaim -}}
Expand Down
2 changes: 1 addition & 1 deletion Schemas/ioc-instance.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"ioc_group": {
"type": "string",
"description": "The name of the repository in which the IOC is grouped",
"description": "Short name for this collection of services",
"default": ""
},
"serviceAccountName": {
Expand Down
Loading