Merge in main (#20)

ios-xr · Sep 24, 2024 · e906001 · e906001
1 parent 61eb61e
commit e906001
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/charts/xrd-common/Chart.yaml b/charts/xrd-common/Chart.yaml
@@ -8,4 +8,4 @@ keywords:
  - xrd
 sources:
  - https://github.com/ios-xr/xrd-helm
-version: 1.1.0-beta.2
+version: 1.1.0-beta.3
diff --git a/charts/xrd-common/templates/_config-configmap.tpl b/charts/xrd-common/templates/_config-configmap.tpl
@@ -18,7 +18,7 @@ data:
     username {{ .Values.config.username }}
      group root-lr
      group cisco-support
-     password {{ .Values.config.password }}
+     secret {{ .Values.config.password }}
     !
     {{- end }}
     {{- if (get .Values.config "ascii") }}

diff --git a/charts/xrd-control-plane/Chart.yaml b/charts/xrd-control-plane/Chart.yaml
@@ -8,8 +8,8 @@ keywords:
 - xrd
 sources:
 - https://github.com/ios-xr/xrd-helm
-version: 1.1.0-beta.2
+version: 1.1.0-beta.3
 dependencies:
 - name: xrd-common
-  version: 1.1.0-beta.2
+  version: 1.1.0-beta.3
   repository: "file://../xrd-common"
diff --git a/charts/xrd-vrouter/Chart.yaml b/charts/xrd-vrouter/Chart.yaml
@@ -8,8 +8,8 @@ keywords:
  - xrd
 sources:
  - https://github.com/ios-xr/xrd-helm
-version: 2.0.0-beta.1
+version: 2.0.0-beta.2
 dependencies:
 - name: xrd-common
-  version: 1.1.0-beta.2
+  version: 1.1.0-beta.3
   repository: "file://../xrd-common"
diff --git a/tests/ut/xrd-control-plane/configmap.bats b/tests/ut/xrd-control-plane/configmap.bats
@@ -71,7 +71,7 @@ setup_file () {
 @test "Control Plane ConfigMap: Startup config can be set using username and password" {
     template --set 'config.username=foo' --set 'config.password=bar'
     assert_query_equal '.data."startup.cfg"' \
-        "username foo\n group root-lr\n group cisco-support\n password bar\n!"
+        "username foo\n group root-lr\n group cisco-support\n secret bar\n!"
 }
 
 @test "Control Plane ConfigMap: password must be set if username is" {

diff --git a/tests/ut/xrd-vrouter/configmap.bats b/tests/ut/xrd-vrouter/configmap.bats
@@ -71,7 +71,7 @@ setup_file () {
 @test "vRouter ConfigMap: Startup config can be set using username and password" {
     template --set 'config.username=foo' --set 'config.password=bar'
     assert_query_equal '.data."startup.cfg"' \
-        "username foo\n group root-lr\n group cisco-support\n password bar\n!"
+        "username foo\n group root-lr\n group cisco-support\n secret bar\n!"
 }
 
 @test "vRouter ConfigMap: password must be set if username is" {