Update chart to include new etcd base chart

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2023 Cray / HPE
+Copyright (c) 2021-2024 Cray / HPE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

changelog/v3.0.md

@@ -5,6 +5,12 @@ All notable changes to this project for v3.0.Z 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).
 
+## [3.0.5] - 2024-01-03
+
+### Changed
+
+- Update chart to rebuild to include new etcd base chart
+
 ## [3.0.4] - 2023-06-30
 
 - FAS version 1.29.0

changelog/v3.1.md

@@ -0,0 +1,12 @@
+# Changelog for v3.1
+
+All notable changes to this project for v3.1.Z 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).
+
+## [3.1.0] - 2024-01-03
+
+### Changed
+
+- Update chart to rebuild to include new etcd base chart

charts/v3.0/cray-hms-firmware-action/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: "cray-hms-firmware-action"
-version: 3.0.4
+version: 3.0.5
 description: "Kubernetes resources for cray-hms-firmware-action"
 home: "https://github.com/Cray-HPE/hms-firmware-action-charts"
 sources:

charts/v3.1/cray-hms-firmware-action/Chart.yaml

@@ -0,0 +1,20 @@
+apiVersion: v2
+name: "cray-hms-firmware-action"
+version: 3.1.0
+description: "Kubernetes resources for cray-hms-firmware-action"
+home: "https://github.com/Cray-HPE/hms-firmware-action-charts"
+sources:
+  - "https://github.com/Cray-HPE/hms-firmware-action"
+dependencies:
+  - name: cray-service
+    version: "~10.0"
+    repository: https://artifactory.algol60.net/artifactory/csm-helm-charts
+  - name: cray-etcd-base
+    version: "~1.1"
+    repository: https://artifactory.algol60.net/artifactory/csm-helm-charts
+maintainers:
+  - name: Hardware Management
+    url: https://github.com/orgs/Cray-HPE/teams/hardware-management
+appVersion: "1.29.0"
+annotations:
+  artifacthub.io/license: "MIT"

charts/v3.1/cray-hms-firmware-action/templates/configmaps.yaml

@@ -0,0 +1,17 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fas-nexus-info
+  namespace: services
+data:
+  nexus_endpoint: "{{ .Values.nexus.endpoint }}"
+  nexus_repo: "{{ .Values.nexus.repo }}"
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fas-cacert-info
+data:
+  CA_URI: "{{ .Values.hms_ca_uri }}"

charts/v3.1/cray-hms-firmware-action/templates/tests/test-functional.yaml

@@ -0,0 +1,36 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ .Release.Name }}-test-functional"
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-weight": "1" #run this after smoke!
+
+  labels:
+    app.kubernetes.io/name: "{{ .Release.Name }}-test-functional"
+
+spec:
+  backoffLimit: 0
+  template:
+    metadata:
+      name: "{{ .Release.Name }}-test-functional"
+      annotations:
+        "proxy.istio.io/config": '{ "holdApplicationUntilProxyStarts": true }'
+      labels:
+        app.kubernetes.io/managed-by:  "{{ include "cray-service.name" . }}"
+        app.kubernetes.io/instance:  "{{ .Release.Name }}-test-functional"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    spec:
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+      containers:
+        - name: "functional"
+          image: "{{ .Values.tests.image.repository }}:{{ .Values.global.testVersion }}"
+          imagePullPolicy: "{{ .Values.tests.image.pullPolicy }}"
+          command: ["/bin/sh", "-c"]
+          args: ["entrypoint.sh tavern -c /src/libs/tavern_global_config.yaml -p /src/app/api/1-non-disruptive"]

charts/v3.1/cray-hms-firmware-action/templates/tests/test-smoke.yaml

@@ -0,0 +1,36 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ .Release.Name }}-test-smoke"
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-weight": "-1" #run this first!
+
+  labels:
+    app.kubernetes.io/name: "{{ .Release.Name }}-test-smoke"
+
+spec:
+  backoffLimit: 0
+  template:
+    metadata:
+      name: "{{ .Release.Name }}-test-smoke"
+      annotations:
+        "proxy.istio.io/config": '{ "holdApplicationUntilProxyStarts": true }'
+      labels:
+        app.kubernetes.io/managed-by:  "{{ include "cray-service.name" . }}"
+        app.kubernetes.io/instance:  "{{ .Release.Name }}-test-smoke"
+        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    spec:
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+      containers:
+        - name: "smoke"
+          image: "{{ .Values.tests.image.repository }}:{{ .Values.global.testVersion }}"
+          imagePullPolicy: "{{ .Values.tests.image.pullPolicy }}"
+          command: ["/bin/sh", "-c"]
+          args: ["entrypoint.sh smoke -f smoke.json -u http://cray-fas"]

charts/v3.1/cray-hms-firmware-action/values.yaml

@@ -0,0 +1,187 @@
+# Please refer to https://stash.us.cray.com/projects/CLOUD/repos/cray-charts/browse/stable/cray-service/values.yaml?at=refs%2Fheads%2Fmaster
+# for more info on values you can set/override
+# Note that cray-service.containers[*].image and cray-service.initContainers[*].image map values are one of the only structures that
+# differ from the standard kubernetes container spec:
+# image:
+#   repository: ""
+#   tag: "" (default = "latest")
+#   pullPolicy: "" (default = "IfNotPresent")
+
+global:
+  appVersion: 1.29.0
+  testVersion: 1.29.0
+
+image:
+  repository: artifactory.algol60.net/csm-docker/stable/cray-firmware-action
+  pullPolicy: IfNotPresent
+
+tests:
+  image:
+    repository: artifactory.algol60.net/csm-docker/stable/cray-firmware-action-hmth-test
+    pullPolicy: IfNotPresent
+
+nexus:
+  endpoint: http://nexus.nexus.svc.cluster.local
+  repo: shasta-firmware
+
+hms_ca_uri: ""
+
+cray-etcd-base:
+  nameOverride: "cray-fas"
+  fullnameOverride: "cray-fas"
+  etcd:
+    enabled: true
+    fullnameOverride: "cray-fas-bitnami-etcd"
+    nameOverride: "cray-fas-bitnami-etcd"
+    disasterRecovery:
+      cronjob:
+        snapshotsDir: "/snapshots/cray-fas-bitnami-etcd"
+        schedule: "0 */1 * * *"
+        historyLimit: 1
+        snapshotHistoryLimit: 24
+    extraEnvVars:
+      - name: ETCD_HEARTBEAT_INTERVAL
+        value: "4200"
+      - name: ETCD_ELECTION_TIMEOUT
+        value: "21000"
+      - name: ETCD_MAX_SNAPSHOTS
+        value: "5"
+      - name: ETCD_QUOTA_BACKEND_BYTES
+        value: "10737418240"
+      - name: ETCD_SNAPSHOT_COUNT
+        value: "10000"
+      - name: ETCD_SNAPSHOT_HISTORY_LIMIT
+        value: "24"
+      - name: ETCD_DISABLE_PRESTOP
+        value: "yes"
+    extraVolumes:
+      - configMap:
+          defaultMode: 420
+          name: cray-fas-bitnami-etcd-config
+        name: etcd-config
+
+cray-service:
+  type: "Deployment"
+  nameOverride: "cray-fas"
+  fullnameOverride: "cray-fas"
+  etcdWaitContainer: true
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                  - istio-ingressgateway
+                  - istio-ingressgateway-hmn
+            topologyKey: "kubernetes.io/hostname"
+            namespaces:
+              - istio-system
+  containers:
+    cray-fas:
+      name: "cray-fas"
+      image:
+        repository: "artifactory.algol60.net/csm-docker/stable/cray-firmware-action"
+      resources:
+        limits:
+          cpu: "4"
+          memory: 4Gi
+        requests:
+          cpu: 500m
+          memory: 256Mi
+      ports:
+        - name: http
+          containerPort: 28800
+      env:
+        - name: SMS_SERVER
+          value: "http://cray-smd"
+        - name: LOG_LEVEL
+          value: "DEBUG"
+        - name: SERVICE_RESERVATION_VERBOSITY
+          value: "ERROR"
+        - name: TRS_IMPLEMENTATION
+          value: "LOCAL"
+        - name: HSMLOCK_ENABLED
+          value: "true"
+        - name: NODE_BLACKLIST
+          value: "ignore_ignore_ignore"
+        - name: STORAGE
+          value: "ETCD"
+        - name: VAULT_ENABLED
+          value: "true"
+        - name: VAULT_ADDR
+          value: "http://cray-vault.vault:8200"
+        - name: VAULT_SKIP_VERIFY
+          value: "true"
+        - name: LAUNCH
+          value: "SERVICE"
+        - name: S3_ENDPOINT
+          valueFrom:
+            secretKeyRef:
+              name: fw-update-s3-credentials
+              key: fw_s3_endpoint
+        - name: S3_BUCKET
+          value: fw-update
+        - name: S3_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: fw-update-s3-credentials
+              key: access_key
+        - name: S3_SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: fw-update-s3-credentials
+              key: secret_key
+        - name: FAS_CA_URI
+          valueFrom:
+            configMapKeyRef:
+              name: fas-cacert-info
+              key: CA_URI
+        - name: NEXUS_ENDPOINT
+          valueFrom:
+            configMapKeyRef:
+              name: fas-nexus-info
+              key: nexus_endpoint
+        - name: NEXUS_REPO
+          valueFrom:
+            configMapKeyRef:
+              name: fas-nexus-info
+              key: nexus_repo
+        - name: FAS_URL
+          value: "cray-fas"
+        - name: API_URL
+          value: "http://cray-fas"
+        - name: API_SERVER_PORT
+          value: ""
+        - name: API_BASE_PATH
+          value: ""
+        - name: LOAD_NEXUS_WAIT_MIN
+          value: "2"
+      livenessProbe:
+        httpGet:
+          port: 28800
+          path: /service/status
+        initialDelaySeconds: 15
+        periodSeconds: 5
+      readinessProbe:
+        httpGet:
+          port: 28800
+          path: /service/status/details
+        initialDelaySeconds: 30
+        periodSeconds: 60
+        timeoutSeconds: 25
+      volumeMounts:
+        - name: cray-pki-cacert-vol
+          mountPath: /usr/local/cray-pki
+  volumes:
+    cray-pki-cacert-vol:
+      name: cray-pki-cacert-vol
+      configMap:
+        name: cray-configmap-ca-public-key
+  ingress:
+    enabled: true
+    uri: "/"
+    prefix: "/apis/fas/v1/"

cray-hms-firmware-action.compatibility.yaml

@@ -5,6 +5,7 @@ chartVersionToCSMVersion:
   ">=2.0.0": "~1.2.0" # Chart Version: 2.0.0 <= x.y.z, CSM Version: 1.2.0 <= x.y.z < 1.3.0
   ">=2.1.0": "~1.3.0"
   ">=3.0.0": "~1.5.0"
+  ">=3.1.0": "~1.6.0"
 
 # The application version must be compliant to semantic versioning.
 # If the application makes a backwards incompatible change, then its major version needs to be increment.
@@ -28,6 +29,8 @@ chartVersionToApplicationVersion:
   "3.0.2": "1.28.0"
   "3.0.3": "1.28.0"
   "3.0.4": "1.29.0"
+  "3.0.5": "1.29.0"
+  "3.1.0": "1.29.0"
 
 # Test results for combinations of Chart, Application, and CSM versions.
 chartValidationLog: []