mirror of
https://github.com/edgelesssys/constellation.git
synced 2024-10-01 01:36:09 -04:00
Fix "enforceIdKeyDigest" capitalization (#369)
* Fix "enforceIdKeyDigest" capitalization * Convert "enforceIdKeyDigest" to string for config map
This commit is contained in:
parent
2d121d9243
commit
fa63e51370
@ -8,7 +8,7 @@ data:
|
||||
enforcedPCRs: {{ .Values.enforcedPCRs | mustToJson }}
|
||||
measurements: {{ .Values.measurements | mustToJson }}
|
||||
{{- if eq .Values.csp "Azure" }}
|
||||
enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest }}
|
||||
enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest | quote }}
|
||||
idkeydigest: {{ .Values.idkeydigest }}
|
||||
{{- end }}
|
||||
binaryData:
|
||||
|
@ -91,7 +91,10 @@ func (i *ChartLoader) loadCilium(csp cloudprovider.Provider, conformanceMode boo
|
||||
}
|
||||
|
||||
// loadConstellationServices loads the constellation-services chart from the embed.FS, marshals it into a helm-package .tgz and sets the values that can be set in the CLI.
|
||||
func (i *ChartLoader) loadConstellationServices(csp cloudprovider.Provider, masterSecret []byte, salt []byte, enforcedPCRs []uint32, enforceIDKeyDigest bool) (helm.Release, error) {
|
||||
func (i *ChartLoader) loadConstellationServices(csp cloudprovider.Provider,
|
||||
masterSecret []byte, salt []byte, enforcedPCRs []uint32,
|
||||
enforceIDKeyDigest bool,
|
||||
) (helm.Release, error) {
|
||||
chart, err := loadChartsDir(HelmFS, "charts/edgeless/constellation-services")
|
||||
if err != nil {
|
||||
return helm.Release{}, fmt.Errorf("loading constellation-services chart: %w", err)
|
||||
@ -134,8 +137,11 @@ func (i *ChartLoader) loadConstellationServices(csp cloudprovider.Provider, mast
|
||||
}
|
||||
|
||||
if csp == cloudprovider.Azure {
|
||||
joinServiceVals := vals["join-service"].(map[string]interface{})
|
||||
joinServiceVals["enforceIDKeyDigest"] = enforceIDKeyDigest
|
||||
joinServiceVals, ok := vals["join-service"].(map[string]any)
|
||||
if !ok {
|
||||
return helm.Release{}, errors.New("invalid join-service values")
|
||||
}
|
||||
joinServiceVals["enforceIdKeyDigest"] = enforceIDKeyDigest
|
||||
}
|
||||
|
||||
return helm.Release{Chart: chartRaw, Values: vals, ReleaseName: "constellation-services", Wait: true}, nil
|
||||
|
Loading…
Reference in New Issue
Block a user