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

Jump to bottom

RANCHER-941 Support ECS OAI-PMH on rancher #59

Merged
merged 1 commit into from
Oct 13, 2023
Merged

RANCHER-941 Support ECS OAI-PMH on rancher #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
charset = utf-8

[*.{yml, yaml}]
indent_size = 2
2 changes: 1 addition & 1 deletion charts/common/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: library
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
29 changes: 27 additions & 2 deletions charts/common/templates/_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
secretKeyRef:
key: ELASTICSEARCH_PORT
name: {{ .Values.elasticSearchConnectParameters }}
{{- end }}
{{- end }}
{{- if .Values.okapiConnectParameters }}
- name: OKAPI_HOST
valueFrom:
Expand Down Expand Up @@ -217,6 +217,31 @@ spec:
secretKeyRef:
key: AWS_BUCKET
name: {{ .Values.awsConnectParameters }}
- name: S3_URL
valueFrom:
secretKeyRef:
key: AWS_URL
name: {{ .Values.awsConnectParameters }}
- name: S3_REGION
valueFrom:
secretKeyRef:
key: AWS_REGION
name: {{ .Values.awsConnectParameters }}
- name: S3_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
key: AWS_ACCESS_KEY_ID
name: {{ .Values.awsConnectParameters }}
- name: S3_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
key: AWS_SECRET_ACCESS_KEY
name: {{ .Values.awsConnectParameters }}
- name: S3_BUCKET
valueFrom:
secretKeyRef:
key: AWS_BUCKET
name: {{ .Values.awsConnectParameters }}
{{- end }}
{{- if .Values.localFsBucketParameters }}
- name: LOCAL_FS_URL
Expand Down Expand Up @@ -286,4 +311,4 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/mod-oai-pmh/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.38
version: 0.1.39

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down