Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-07 06:22:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix "enforceIdKeyDigest" capitalization (#369)

Browse source 
* Fix "enforceIdKeyDigest" capitalization
* Convert "enforceIdKeyDigest" to string for config map
This commit is contained in:
Malte Poll 2022-10-25 16:29:28 +02:00 • committed by GitHub
parent 2d121d9243
commit fa63e51370
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/internal/helm/charts/edgeless/constellation-services/charts/join-service/templates/configmap.yaml
View file

@ -8,7 +8,7 @@ data:
enforcedPCRs: {{ .Values.enforcedPCRs | mustToJson }} enforcedPCRs: {{ .Values.enforcedPCRs | mustToJson }}
measurements: {{ .Values.measurements | mustToJson }} measurements: {{ .Values.measurements | mustToJson }}
{{- if eq .Values.csp "Azure" }} {{- if eq .Values.csp "Azure" }}
enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest }} enforceIdKeyDigest: {{ .Values.enforceIdKeyDigest | quote }}
idkeydigest: {{ .Values.idkeydigest }} idkeydigest: {{ .Values.idkeydigest }}
{{- end }} {{- end }}
binaryData: binaryData:

12
cli/internal/helm/loader.go
View file

@ -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. // 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") chart, err := loadChartsDir(HelmFS, "charts/edgeless/constellation-services")
if err != nil { if err != nil {
return helm.Release{}, fmt.Errorf("loading constellation-services chart: %w", err) 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 { if csp == cloudprovider.Azure {
joinServiceVals := vals["join-service"].(map[string]interface{}) joinServiceVals, ok := vals["join-service"].(map[string]any)
joinServiceVals["enforceIDKeyDigest"] = enforceIDKeyDigest 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 return helm.Release{Chart: chartRaw, Values: vals, ReleaseName: "constellation-services", Wait: true}, nil