Skip to content

Commit

Permalink
Adapt to gardener-1.87.2
Browse files Browse the repository at this point in the history
  • Loading branch information
axel7born committed Feb 6, 2024
1 parent 492d16a commit ea1b652
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions pkg/charts/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ import (
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/gardener/gardener/pkg/chartrenderer"
"github.com/gardener/gardener/pkg/utils"
"gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/gardener/gardener-extension-networking-cilium/charts"
Expand Down Expand Up @@ -69,16 +67,11 @@ func RenderCiliumChart(renderer chartrenderer.Interface, config *ciliumv1alpha1.
}

func getConfigMapHash(release *chartrenderer.RenderedChart) (string, error) {
configMap := &corev1.ConfigMap{}
configMapPath := "cilium/charts/config/templates/configmap.yaml"
configMapFile, ok := release.Files()[configMapPath]
configMapData, ok := release.Files()[configMapPath]
if !ok {
return "", fmt.Errorf("configmap not found in the given path: %s", configMapPath)
}

if err := yaml.Unmarshal([]byte(configMapFile), &configMap); err != nil {
return "", fmt.Errorf("error unmarshalling configMap: %w, %s", err, configMapFile)
}

return utils.ComputeConfigMapChecksum(configMap.Data), nil
return utils.ComputeConfigMapChecksum(configMapData), nil
}

0 comments on commit ea1b652

Please sign in to comment.