Skip to content

Commit 9502c20

Browse files
authored
chore: update repository (#247)
Co-authored-by: GitHub Actions <jikkai@users.noreply.github.com>
1 parent 37a351f commit 9502c20

20 files changed

Lines changed: 79 additions & 41 deletions

File tree

charts/collaboration-demo/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.15.1 # VERSION
18+
version: 0.15.2 # VERSION
1919

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

charts/collaboration-demo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ image:
1111
repository: release/univer-collaboration-lite
1212
pullPolicy: IfNotPresent
1313
# Overrides the image tag whose default is the chart appVersion.
14-
tag: 0.15.1 # VERSION
14+
tag: 0.15.2 # VERSION
1515

1616
imagePullSecrets: []
1717
nameOverride: ""

charts/collaboration-helper-server/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.15.1 # VERSION
18+
version: 0.15.2 # VERSION
1919

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

charts/collaboration-helper-server/templates/_helpers.tpl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,21 @@ app.kubernetes.io/name: {{ include "collaboration-helper-server.name" . }}
5353
{{/* vim: set filetype=mustache: */}}
5454
{{/*
5555
Return the proper image name
56-
{{ include "common.images.image" ( dict "image" .Values.path.to.the.image ) }}
56+
{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" .Values.global ) }}
5757
*/}}
5858
{{- define "common.images.image" -}}
59-
{{- $registryName := .image.registry -}}
60-
{{- $repositoryName := .image.repository -}}
59+
{{- $registryName := .imageRoot.registry -}}
60+
{{- $repositoryName := .imageRoot.repository -}}
6161
{{- $separator := ":" -}}
62-
{{- $termination := .image.tag | toString -}}
63-
{{- if .image.digest }}
62+
{{- $termination := .imageRoot.tag | toString -}}
63+
{{- if .global }}
64+
{{- if .global.imageRegistry }}
65+
{{- $registryName = .global.imageRegistry -}}
66+
{{- end -}}
67+
{{- end -}}
68+
{{- if .imageRoot.digest }}
6469
{{- $separator = "@" -}}
65-
{{- $termination = .image.digest | toString -}}
70+
{{- $termination = .imageRoot.digest | toString -}}
6671
{{- end -}}
6772
{{- if $registryName }}
6873
{{- printf "%s/%s%s%s" $registryName $repositoryName $separator $termination -}}
@@ -71,6 +76,7 @@ Return the proper image name
7176
{{- end -}}
7277
{{- end -}}
7378

79+
7480
{{- define "collaboration-helper-server.istio.labels" -}}
7581
version: {{ .Values.istio.version | quote }}
7682
{{- end }}

charts/collaboration-helper-server/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
- name: {{ .Chart.Name }}
3333
securityContext:
3434
{{- toYaml .Values.securityContext | nindent 12 }}
35-
image: {{ include "common.images.image" .Values }}
35+
image: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
3636
imagePullPolicy: {{ .Values.image.pullPolicy }}
3737
command:
3838
- pnpm

charts/collaboration-helper-server/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
44

5+
global:
6+
istioDefaultRevision: default
7+
8+
59
replicaCount: 1
610

711
image:
812
registry: univer-acr-registry.cn-shenzhen.cr.aliyuncs.com
913
repository: release/univer-collaboration
1014
pullPolicy: IfNotPresent
1115
# Overrides the image tag whose default is the chart appVersion.
12-
tag: 0.15.1 # VERSION
16+
tag: 0.15.2 # VERSION
1317

1418
imagePullSecrets: []
1519
nameOverride: ""

charts/collaboration-server/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.15.1 # VERSION
18+
version: 0.15.2 # VERSION
1919

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

charts/collaboration-server/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ image:
1212
repository: release/univer-collaboration
1313
pullPolicy: IfNotPresent
1414
# Overrides the image tag whose default is the chart appVersion.
15-
tag: 0.15.1 # VERSION
15+
tag: 0.15.2 # VERSION
1616

1717
imagePullSecrets: []
1818
nameOverride: ""

charts/univer-ssc/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.15.1 # VERSION
18+
version: 0.15.2 # VERSION
1919

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

charts/univer-ssc/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image:
99
repository: release/univer-collaboration
1010
pullPolicy: IfNotPresent
1111
# Overrides the image tag whose default is the chart appVersion.
12-
tag: 0.15.1 # VERSION
12+
tag: 0.15.2 # VERSION
1313

1414
imagePullSecrets: []
1515
nameOverride: ""

0 commit comments

Comments
 (0)