Merge pull request #37 from ByConity/use_image_tag

use_image_tag
ByConity · Dec 14, 2023 · 261049a · 261049a
2 parents 8be1566 + eb50691
commit 261049a
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 18 deletions.
diff --git a/chart/byconity/Chart.lock 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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”