Skip to content

Commit

Permalink
Rancher-1303 DIS functionality enable on-demand for S3 based envs inc…
Browse files Browse the repository at this point in the history
…luding sprint-testing. (#106)

* .RANCHER-1303 DIS + S3 include

* RANCHER-1278 RANCHER-1279 (#92)

* RANCHER-1278 RANCHER-1279

* change resources

* .RANCHER-1303 mod-users KTC enable (#94)

* RANCHER-1329 add mod-reading-room (#95)

* RAMCHER-1333 change agent version (#96)

* RANCHER-1229 add kafka dev values (#97)

* Rancher 1229 fix (#99)

* hotfix

* up chart version

* Rancher 1229 fix (#101)

* hotfix

* up chart version

* RANCHER-1229 fix helm deployment

* RANCHER-1229 fix helm deployment

* fix helm deployment (#105)

* .mod-users-KTC-enable align common chart's version

* .DIS-enable align common chart's version

---------

Co-authored-by: Arsen <[email protected]>
  • Loading branch information
eldiiar-duishenaliev and aatoyan authored Apr 24, 2024
1 parent aedc2a7 commit 883ba43
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 2 deletions.
2 changes: 1 addition & 1 deletion charts/common/Chart.yaml
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.39
version: 0.1.40

# 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
56 changes: 56 additions & 0 deletions charts/common/templates/_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,62 @@ spec:
- name: LEGACY_TOKEN_TENANTS
value: {{- if .Values.rtrEnabled }} {{- else }} '*' {{- end }}
{{- end }}
{{- if .Values.disEnabled }}
- name: SPLIT_FILES_ENABLED
value: true
- name: AWS_URL
valueFrom:
secretKeyRef:
key: AWS_URL
name: {{ .Values.awsConnectParameters }}
- name: AWS_REGION
valueFrom:
secretKeyRef:
key: AWS_REGION
name: {{ .Values.awsConnectParameters }}
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
key: AWS_ACCESS_KEY_ID
name: {{ .Values.awsConnectParameters }}
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
key: AWS_SECRET_ACCESS_KEY
name: {{ .Values.awsConnectParameters }}
- name: AWS_BUCKET
valueFrom:
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 }}
- name: AWS_SDK
value: true
{{- end }}
{{- if .Values.modSearchDev }}
- name: KAFKA_CONTRIBUTORS_TOPIC_PARTITIONS
value: "2"
Expand Down
2 changes: 1 addition & 1 deletion charts/mod-data-import/Chart.yaml
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.41
version: 0.1.43

# 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

0 comments on commit 883ba43

Please sign in to comment.