From eb50691efb7e9b796fd1cbb1743ea09ed9ff0b7d Mon Sep 17 00:00:00 2001 From: ZhouWenyu Date: Fri, 3 Nov 2023 14:18:52 +0800 Subject: [PATCH] use_image_tag --- chart/byconity/Chart.lock | 9 +++++++++ chart/byconity/Chart.yaml | 2 ++ chart/byconity/templates/daemonmanager.yaml | 4 ++-- chart/byconity/templates/resourcemanager.yaml | 4 ++-- chart/byconity/templates/server.yaml | 4 ++-- chart/byconity/templates/tso.yaml | 4 ++-- chart/byconity/templates/vw.yaml | 4 ++-- chart/byconity/values.yaml | 7 +++++-- examples/k8s/value_HA_example.yaml | 7 +++++-- examples/k8s/values.yaml | 7 +++++-- examples/k8s/values_use_existing_fdb.yaml | 7 +++++-- 11 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 chart/byconity/Chart.lock diff --git a/chart/byconity/Chart.lock b/chart/byconity/Chart.lock new file mode 100644 index 0000000..d6dfe33 --- /dev/null +++ b/chart/byconity/Chart.lock @@ -0,0 +1,9 @@ +dependencies: +- name: hdfs + repository: "" + version: 1.0.0 +- name: fdb-operator + repository: "" + version: 0.2.0 +digest: sha256:bc5340d31aade1a2c5d5aae362e90c217e011f56fa952fb95300b3b5a681f202 +generated: "2023-09-20T17:30:02.964424+08:00" diff --git a/chart/byconity/Chart.yaml b/chart/byconity/Chart.yaml index 962c4e5..3d278bb 100644 --- a/chart/byconity/Chart.yaml +++ b/chart/byconity/Chart.yaml @@ -26,5 +26,7 @@ appVersion: "1.16.0" dependencies: - name: hdfs condition: hdfs.enabled + version: 1.0.0 - name: fdb-operator condition: fdb-operator.enabled + version: 0.2.0 diff --git a/chart/byconity/templates/daemonmanager.yaml b/chart/byconity/templates/daemonmanager.yaml index 172c1df..7bd2e32 100644 --- a/chart/byconity/templates/daemonmanager.yaml +++ b/chart/byconity/templates/daemonmanager.yaml @@ -26,8 +26,8 @@ spec: spec: containers: - name: byconity-daemon-manager - image: {{ coalesce .image $.Values.byconity.image }} - imagePullPolicy: {{ $.Values.byconity.imagePullPolicy }} + image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }} + imagePullPolicy: {{ $.Values.image.imagePullPolicy }} env: {{- toYaml $.Values.byconity.commonEnvs | nindent 12 }} - name: BYCONITY_ROLE diff --git a/chart/byconity/templates/resourcemanager.yaml b/chart/byconity/templates/resourcemanager.yaml index 793e629..803b249 100644 --- a/chart/byconity/templates/resourcemanager.yaml +++ b/chart/byconity/templates/resourcemanager.yaml @@ -26,8 +26,8 @@ spec: spec: containers: - name: byconity-resource-manager - image: {{ coalesce .image $.Values.byconity.image }} - imagePullPolicy: {{ $.Values.byconity.imagePullPolicy }} + image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }} + imagePullPolicy: {{ $.Values.image.imagePullPolicy }} env: {{- toYaml $.Values.byconity.commonEnvs | nindent 12 }} - name: BYCONITY_ROLE diff --git a/chart/byconity/templates/server.yaml b/chart/byconity/templates/server.yaml index 0f20a79..212548b 100644 --- a/chart/byconity/templates/server.yaml +++ b/chart/byconity/templates/server.yaml @@ -27,8 +27,8 @@ spec: spec: containers: - name: byconity-server - image: {{ coalesce .image $.Values.byconity.image }} - imagePullPolicy: {{ $.Values.byconity.imagePullPolicy }} + image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }} + imagePullPolicy: {{ $.Values.image.imagePullPolicy }} env: {{- toYaml $.Values.byconity.commonEnvs | nindent 12 }} - name: BYCONITY_ROLE diff --git a/chart/byconity/templates/tso.yaml b/chart/byconity/templates/tso.yaml index 78cbe39..9b19e5e 100644 --- a/chart/byconity/templates/tso.yaml +++ b/chart/byconity/templates/tso.yaml @@ -27,8 +27,8 @@ spec: spec: containers: - name: byconity-tso - image: {{ coalesce .image $.Values.byconity.image }} - imagePullPolicy: {{ $.Values.byconity.imagePullPolicy }} + image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }} + imagePullPolicy: {{ $.Values.image.imagePullPolicy }} env: {{- toYaml $.Values.byconity.commonEnvs | nindent 12 }} - name: BYCONITY_ROLE diff --git a/chart/byconity/templates/vw.yaml b/chart/byconity/templates/vw.yaml index 843f7b0..6ebae23 100644 --- a/chart/byconity/templates/vw.yaml +++ b/chart/byconity/templates/vw.yaml @@ -31,8 +31,8 @@ spec: spec: containers: - name: byconity-worker - image: {{ coalesce .image $.Values.byconity.image }} - imagePullPolicy: {{ $.Values.byconity.imagePullPolicy }} + image: {{ $.Values.image.repository }}:{{ $.Values.image.tag }} + imagePullPolicy: {{ $.Values.image.imagePullPolicy }} env: {{- toYaml $.Values.byconity.commonEnvs | nindent 12 }} - name: BYCONITY_ROLE diff --git a/chart/byconity/values.yaml b/chart/byconity/values.yaml index 3d90743..46b8559 100644 --- a/chart/byconity/values.yaml +++ b/chart/byconity/values.yaml @@ -5,9 +5,12 @@ nameOverride: "" fullnameOverride: "" -byconity: - image: byconity/byconity:stable +image: + repository: byconity/byconity + tag: stable imagePullPolicy: IfNotPresent + +byconity: hdfs_address: hdfs://byconity-hdfs-namenodes:8020 #default hdfs # if “hdfs_ha_nameservice” is configured, the “hdfs_address” configuration will be ineffective # hdfs_ha_nameservice: hdfs_service # after configuring “namespace”, you need to configure the address of the namespace in “hdfs3Config” diff --git a/examples/k8s/value_HA_example.yaml b/examples/k8s/value_HA_example.yaml index 5158ad1..ff338f5 100644 --- a/examples/k8s/value_HA_example.yaml +++ b/examples/k8s/value_HA_example.yaml @@ -5,9 +5,12 @@ nameOverride: "" fullnameOverride: "" -byconity: - image: byconity/byconity:stable +image: + repository: byconity/byconity + tag: stable imagePullPolicy: IfNotPresent + +byconity: hdfs_address: hdfs://byconity-hdfs-namenodes:8020 # can using your own hdfs # if “hdfs_ha_nameservice” is configured, the “hdfs_address” configuration will be ineffective # hdfs_ha_nameservice: hdfs_service # after configuring “namespace”, you need to configure the address of the namespace in “hdfs3Config” diff --git a/examples/k8s/values.yaml b/examples/k8s/values.yaml index dee3a68..c1d5e4f 100644 --- a/examples/k8s/values.yaml +++ b/examples/k8s/values.yaml @@ -5,9 +5,12 @@ nameOverride: "" fullnameOverride: "" -byconity: - image: byconity/byconity:stable +image: + repository: byconity/byconity + tag: stable imagePullPolicy: IfNotPresent + +byconity: hdfs_address: hdfs://byconity-hdfs-namenodes:8020 # can using your own hdfs # if “hdfs_ha_nameservice” is configured, the “hdfs_address” configuration will be ineffective # hdfs_ha_nameservice: hdfs_service # after configuring “namespace”, you need to configure the address of the namespace in “hdfs3Config” diff --git a/examples/k8s/values_use_existing_fdb.yaml b/examples/k8s/values_use_existing_fdb.yaml index b3cdb40..1101630 100644 --- a/examples/k8s/values_use_existing_fdb.yaml +++ b/examples/k8s/values_use_existing_fdb.yaml @@ -5,9 +5,12 @@ nameOverride: "" fullnameOverride: "" -byconity: - image: byconity/byconity:stable +image: + repository: byconity/byconity + tag: stable imagePullPolicy: IfNotPresent + +byconity: hdfs_address: hdfs://byconity-hdfs-namenodes:8020 # can using your own hdfs # if “hdfs_ha_nameservice” is configured, the “hdfs_address” configuration will be ineffective # hdfs_ha_nameservice: hdfs_service # after configuring “namespace”, you need to configure the address of the namespace in “hdfs3Config”