Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-04 15:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

internal: move components into their own package

Browse source
This commit is contained in:
Leonard Cohnen 2023-01-06 12:04:36 +01:00 • committed by 3u13r
parent 433e9cdd8b
commit 3637909a46
18 changed files with 156 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

14
joinservice/internal/kubernetes/kubernetes.go
View file

@ -15,7 +15,7 @@ import (
"time"
"github.com/edgelesssys/constellation/v2/internal/constants"
"github.com/edgelesssys/constellation/v2/internal/versions"
"github.com/edgelesssys/constellation/v2/internal/versions/components"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -52,16 +52,16 @@ func New() (*Client, error) {
}
// GetComponents returns the components of the cluster.
func (c *Client) GetComponents(ctx context.Context, configMapName string) (versions.ComponentVersions, error) {
func (c *Client) GetComponents(ctx context.Context, configMapName string) (components.Components, error) {
componentsRaw, err := c.getConfigMapData(ctx, configMapName, constants.ComponentsListKey)
if err != nil {
return versions.ComponentVersions{}, fmt.Errorf("failed to get components: %w", err)
return components.Components{}, fmt.Errorf("failed to get components: %w", err)
}
var components versions.ComponentVersions
if err := json.Unmarshal([]byte(componentsRaw), &components); err != nil {
return versions.ComponentVersions{}, fmt.Errorf("failed to unmarshal components %s: %w", componentsRaw, err)
var clusterComponents components.Components
if err := json.Unmarshal([]byte(componentsRaw), &clusterComponents); err != nil {
return components.Components{}, fmt.Errorf("failed to unmarshal components %s: %w", componentsRaw, err)
}
return components, nil
return clusterComponents, nil
}
func (c *Client) getConfigMapData(ctx context.Context, name, key string) (string, error) {