Skip to content

Commit

Permalink
Merge pull request #12 from Cray-HPE/feature/csm-1.2-phase5
Browse files Browse the repository at this point in the history
Added GitHub configuration files and fixed snyk warning
  • Loading branch information
shunr-hpe authored Aug 12, 2021
2 parents 0951bcd + c2c50ea commit 5ac4687
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Hardware Management Team Members and Administrators
* @Cray-HPE/hardware-management @Cray-HPE/hardware-management-admin
58 changes: 58 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
### Summary and Scope

EXPLAIN WHY THIS PR IS NECESSARY. WHAT IS IMPACTED?
IS THIS A NEW FEATURE OR CRITICAL BUG FIX? SUMMARIZE WHAT CHANGED.

DOES THIS CHANGE INVOLVE ANY SCHEME CHANGES? Y/N

REMINDER: HAVE YOU INCREMENTED VERSION NUMBERS? E.G., .spec, Chart.yaml, .version, CHANGELOG.md

REMINDER 2: HAVE YOU UPDATED THE COPYRIGHT PER hpe GUIDELINES: (C) Copyright 2014-2021 Hewlett Packard Enterprise Development LP ? Y/N

### Issues and Related PRs

LIST AND CHARACTERIZE RELATIONSHIP TO JIRA ISSUES AND OTHER PULL REQUESTS. BE SURE LIST DEPENDENCIES.

* Resolves CASM-XYZ
* Change will also be needed in `<insert branch name here>`
* Future work required by CASM-ABC
* Merge with `<insert PR URL here>`
* Merge before `<insert PR URL here>`
* Merge after `<insert PR URL here>`

### Testing

LIST THE ENVIRONMENTS IN WHICH THESE CHANGES WERE TESTED.

Tested on:

* `<drink system>`
* Craystack
* CMS base-box
* Virtual Shasta

Were the install/upgrade based validation checks/tests run?(goss tests/install-validation doc)
Were continuous integration tests run? Y/N If not, Why?
Was an Upgrade tested? Y/N If not, Why?
Was a Downgrade tested? Y/N If not, Why?
If schema changes were part of this change, how were those handled in your upgrade/downgrade testing?

WHAT WAS THE EXTENT OF TESTING PERFORMED? MANUAL VERSUS AUTOMATED TESTS (UNIT/SMOKE/OTHER)
HOW WERE CHANGES VERIFIED TO BE SUCCESSFUL?

### Risks and Mitigations

HAS A SECURITY AUDIT BEEN RUN? (./runSnyk.sh)
ARE THERE KNOWN ISSUES WITH THESE CHANGES?
ANY OTHER SPECIAL CONSIDERATIONS?

INCLUDE THE FOLLOWING ITEMS THAT APPLY. LIST ADDITIONAL ITEMS AND PROVIDE MORE DETAILED INFORMATION AS APPROPRIATE.

Requires:

* Additional testing on bare-metal
* Compute nodes
* 3rd party software
* Broader integration testing
* Fresh install
* Platform upgrade
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.idea/
.idea/
kubernetes/.packaged/
kubernetes/cray-hms-scsd/charts/
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
1.7.4
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.7.4] - 2021-08-10

### Changed

- Added GitHub config files
- Fixed snyk issue in Dockerfiles

## [1.7.3] - 2021-07-27

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ EXPOSE 25309
STOPSIGNAL SIGTERM

RUN set -ex \
&& apk update \
&& apk -U upgrade \
&& apk add --no-cache curl

# Setup environment variables.
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ VERSION ?= $(shell cat .version)
# Helm Chart
CHART_PATH ?= kubernetes
CHART_NAME ?= cray-hms-scsd
CHART_VERSION ?= local
CHART_VERSION ?= $(shell cat .version)

all: image chart unittest coverage integration

image:
docker build --pull ${DOCKER_ARGS} --tag '${NAME}:${VERSION}' .

chart:
helm repo add cray-algol60 https://artifactory.algol60.net/artifactory/csm-helm-charts
helm dep up ${CHART_PATH}/${CHART_NAME}
helm package ${CHART_PATH}/${CHART_NAME} -d ${CHART_PATH}/.packaged --version ${CHART_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/cray-hms-scsd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
description: "Kubernetes resources for cray-hms-scsd"
name: "cray-hms-scsd"
home: "HMS/hms-scsd"
version: 1.7.3
version: 1.7.4
8 changes: 4 additions & 4 deletions kubernetes/cray-hms-scsd/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: cray-service
repository: http://helmrepo.dev.cray.com:8080
version: 1.4.0-20200428175515+d8fabb1
digest: sha256:7fd613148b375aeaea457ae88b8d7591d3c8ca9bf97a3f3b1c8c1452af067663
generated: "2020-04-29T14:43:17.60331-05:00"
repository: https://artifactory.algol60.net/artifactory/csm-helm-charts
version: 2.8.0
digest: sha256:4a60684923c7310e8db14a2956c03a18e49bc68261dcf8833e3aaf27e17e406f
generated: "2021-08-11T15:04:04.713022852-06:00"
4 changes: 2 additions & 2 deletions kubernetes/cray-hms-scsd/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: cray-service
version: "^2.0.0"
repository: "@cray-internal"
version: "~2.8.0"
repository: "@cray-algol60"

0 comments on commit 5ac4687

Please sign in to comment.