mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-07-28 01:35:18 -04:00
cli: use state file on init and upgrade (#2395)
* [wip] use state file in CLI Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> tidy Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * use state file in CLI Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> take clusterConfig from IDFile for compat Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> various fixes Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> wip Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add GCP-specific values in Helm loader test Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove unnecessary pointer Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * write ClusterValues in one step Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * move stub to test file Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove mention of id-file Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * move output to `migrateTerraform` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * unconditional assignments converting from idFile Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * move require block in go modules file Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * fall back to id file on upgrade Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * tidy Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * fix linter check Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add notice to remove Terraform state check on manual migration Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add `name` field Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> fix name tests Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * return early if no Terraform diff Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * tidy Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * return infrastructure state even if no diff exists Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add TODO to remove comment Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * use state-file in miniconstellation Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * cli: remove id-file (#2402) * remove id-file from `constellation create` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add file renaming to handler * rename id-file after upgrade * use idFile on `constellation init` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove id-file from `constellation verify` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * linter fixes Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove id-file from `constellation mini` * remove id-file from `constellation recover` * linter fixes * remove id-file from `constellation terminate` * fix initSecret type * fix recover argument precedence * fix terminate test * generate * add TODO to remove id-file removal * Update cli/internal/cmd/init.go Co-authored-by: Adrian Stobbe <stobbe.adrian@gmail.com> * fix verify arg parse logic Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * add version test Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove id-file from docs * add file not found log * use state-file in miniconstellation Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove id-file from `constellation iam destroy` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * remove id-file from `cdbg deploy` Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --------- Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> Co-authored-by: Adrian Stobbe <stobbe.adrian@gmail.com> * use state-file in CI Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> * update orchestration docs --------- Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> Co-authored-by: Adrian Stobbe <stobbe.adrian@gmail.com>
This commit is contained in:
Moritz Sanft
GitHub
parent
dbf40d185c
commit
005e865a13
51 changed files with 1189 additions and 497 deletions
|
|
@ -7,33 +7,117 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
// package state defines the structure of the Constellation state file.
|
||||
package state
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"dario.cat/mergo"
|
||||
"github.com/edgelesssys/constellation/v2/cli/internal/clusterid"
|
||||
"github.com/edgelesssys/constellation/v2/internal/config"
|
||||
"github.com/edgelesssys/constellation/v2/internal/file"
|
||||
)
|
||||
|
||||
const (
|
||||
// Version1 is the first version of the state file.
|
||||
Version1 = "v1"
|
||||
)
|
||||
|
||||
// ReadFromFile reads the state file at the given path and returns the state.
|
||||
func ReadFromFile(fileHandler file.Handler, path string) (*State, error) {
|
||||
state := &State{}
|
||||
if err := fileHandler.ReadYAML(path, &state); err != nil {
|
||||
return nil, fmt.Errorf("reading state file: %w", err)
|
||||
}
|
||||
return state, nil
|
||||
}
|
||||
|
||||
// State describe the entire state to describe a Constellation cluster.
|
||||
type State struct {
|
||||
Version string `yaml:"version"`
|
||||
Infrastructure Infrastructure `yaml:"infrastructure"`
|
||||
ClusterValues ClusterValues `yaml:"clusterValues"`
|
||||
}
|
||||
|
||||
// NewState creates a new state with the given infrastructure.
|
||||
func NewState(Infrastructure Infrastructure) State {
|
||||
return State{
|
||||
Version: Version1,
|
||||
Infrastructure: Infrastructure,
|
||||
// New creates a new cluster state (file).
|
||||
func New() *State {
|
||||
return &State{
|
||||
Version: Version1,
|
||||
}
|
||||
}
|
||||
|
||||
// NewFromIDFile creates a new cluster state file from the given ID file and config.
|
||||
func NewFromIDFile(idFile clusterid.File, cfg *config.Config) *State {
|
||||
s := New().
|
||||
SetClusterValues(ClusterValues{
|
||||
OwnerID: idFile.OwnerID,
|
||||
ClusterID: idFile.ClusterID,
|
||||
MeasurementSalt: idFile.MeasurementSalt,
|
||||
}).
|
||||
SetInfrastructure(Infrastructure{
|
||||
UID: idFile.UID,
|
||||
ClusterEndpoint: idFile.IP,
|
||||
APIServerCertSANs: idFile.APIServerCertSANs,
|
||||
InitSecret: idFile.InitSecret,
|
||||
Name: clusterid.GetClusterName(cfg, idFile),
|
||||
})
|
||||
|
||||
if idFile.AttestationURL != "" {
|
||||
s.Infrastructure.Azure = &Azure{
|
||||
AttestationURL: idFile.AttestationURL,
|
||||
}
|
||||
}
|
||||
|
||||
return s
|
||||
}
|
||||
|
||||
// SetInfrastructure sets the infrastructure state.
|
||||
func (s *State) SetInfrastructure(infrastructure Infrastructure) *State {
|
||||
s.Infrastructure = infrastructure
|
||||
return s
|
||||
}
|
||||
|
||||
// SetClusterValues sets the cluster values.
|
||||
func (s *State) SetClusterValues(clusterValues ClusterValues) *State {
|
||||
s.ClusterValues = clusterValues
|
||||
return s
|
||||
}
|
||||
|
||||
// WriteToFile writes the state to the given path, overwriting any existing file.
|
||||
func (s *State) WriteToFile(fileHandler file.Handler, path string) error {
|
||||
if err := fileHandler.WriteYAML(path, s, file.OptMkdirAll, file.OptOverwrite); err != nil {
|
||||
return fmt.Errorf("writing state file: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Merge merges the state information from other into the current state.
|
||||
// If a field is set in both states, the value of the other state is used.
|
||||
func (s *State) Merge(other *State) (*State, error) {
|
||||
if err := mergo.Merge(s, other, mergo.WithOverride); err != nil {
|
||||
return nil, fmt.Errorf("merging state file: %w", err)
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
// ClusterValues describe the (Kubernetes) cluster state, set during initialization of the cluster.
|
||||
type ClusterValues struct {
|
||||
// ClusterID is the unique identifier of the cluster.
|
||||
ClusterID string `yaml:"clusterID"`
|
||||
// OwnerID is the unique identifier of the owner of the cluster.
|
||||
OwnerID string `yaml:"ownerID"`
|
||||
// MeasurementSalt is the salt generated during cluster init.
|
||||
MeasurementSalt []byte `yaml:"measurementSalt"`
|
||||
}
|
||||
|
||||
// Infrastructure describe the state related to the cloud resources of the cluster.
|
||||
type Infrastructure struct {
|
||||
UID string `yaml:"uid"`
|
||||
ClusterEndpoint string `yaml:"clusterEndpoint"`
|
||||
InitSecret string `yaml:"initSecret"`
|
||||
InitSecret []byte `yaml:"initSecret"`
|
||||
APIServerCertSANs []string `yaml:"apiServerCertSANs"`
|
||||
Azure *Azure `yaml:"azure,omitempty"`
|
||||
GCP *GCP `yaml:"gcp,omitempty"`
|
||||
// Name is the name of the cluster.
|
||||
Name string `yaml:"name"`
|
||||
Azure *Azure `yaml:"azure,omitempty"`
|
||||
GCP *GCP `yaml:"gcp,omitempty"`
|
||||
}
|
||||
|
||||
// GCP describes the infra state related to GCP.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue