Merge pull request #19 from Cray-HPE/release/csm-1.2

Fixed security vulnerability
OpenCHAMI · Aug 5, 2021 · faa6f3f · faa6f3f
2 parents 8144fbd + 782da51
commit faa6f3f
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 40 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.9.6
+1.9.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.9.6] - 2021-08-02
+
+## [1.9.7] - 2021-08-05
+
+### Changed
+
+- CASMHMS-4943 - Upgraded gopkg.in/yam.v2 to resolve vulnerability.
+
+## [1.9.6] - 2021-08-03
 
 ### Added
 

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ VERSION ?= $(shell cat .version)
 # Helm Chart
 CHART_PATH ?= kubernetes
 CHART_NAME ?= cray-hms-bss
-CHART_VERSION ?= local
+CHART_VERSION ?= $(shell cat .version)
 
 all : image chart
 

diff --git a/go.mod b/go.mod
@@ -8,5 +8,5 @@ require (
 	github.com/Cray-HPE/hms-s3 v1.9.2
 	github.com/Cray-HPE/hms-smd v1.30.9
 	github.com/evanphx/json-patch v4.9.0+incompatible
-	gopkg.in/yaml.v2 v2.2.7
+	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
@@ -653,8 +653,9 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

diff --git a/kubernetes/cray-hms-bss/Chart.yaml b/kubernetes/cray-hms-bss/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 description: "Kubernetes resources for cray-hms-bss"
 name: "cray-hms-bss"
 home: "HMS/hms-bss"
-version: 1.9.6
+version: 1.9.7
diff --git a/kubernetes/cray-hms-bss/requirements.lock b/kubernetes/cray-hms-bss/requirements.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: https://artifactory.algol60.net/artifactory/csm-helm-charts
   version: 2.8.0
 digest: sha256:f4f2b37a8d941f327fa470a3264c10e48f67914c7d490b2cdc4faf208ff8e37a
-generated: "2021-08-02T15:16:10.143166185-05:00"
+generated: "2021-08-03T15:25:59.222855066-05:00"
diff --git a/vendor/gopkg.in/yaml.v2/.travis.yml b/vendor/gopkg.in/yaml.v2/.travis.yml
diff --git a/vendor/gopkg.in/yaml.v2/apic.go b/vendor/gopkg.in/yaml.v2/apic.go
diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod
diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/gopkg.in/yaml.v2/scannerc.go
diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go
diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -230,6 +230,6 @@ gopkg.in/square/go-jose.v2
 gopkg.in/square/go-jose.v2/cipher
 gopkg.in/square/go-jose.v2/json
 gopkg.in/square/go-jose.v2/jwt
-# gopkg.in/yaml.v2 v2.2.7
+# gopkg.in/yaml.v2 v2.4.0
 ## explicit
 gopkg.in/yaml.v2