Skip to content

Commit

Permalink
Remove PlatformProvider from pipedv1 config
Browse files Browse the repository at this point in the history 
Signed-off-by: khanhtc1202 <[email protected]>
  • Loading branch information
@khanhtc1202
khanhtc1202 committed Jan 24, 2025
1 parent cc28c03 commit b65379f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 594 deletions.
40 changes: 13 additions & 27 deletions pkg/app/pipedv1/cmd/piped/piped.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,16 @@ type piped struct {
configGCPSecret string
configAWSSecret string

insecure bool
certFile string
adminPort int
pluginServicePort int
toolsDir string
pluginsDir string
enableDefaultKubernetesCloudProvider bool
gracePeriod time.Duration
addLoginUserToPasswd bool
launcherVersion string
maxRecvMsgSize int
insecure bool
certFile string
adminPort int
pluginServicePort int
toolsDir string
pluginsDir string
gracePeriod time.Duration
addLoginUserToPasswd bool
launcherVersion string
maxRecvMsgSize int
}

func NewCommand() *cobra.Command {
Expand Down Expand Up @@ -132,7 +131,6 @@ func NewCommand() *cobra.Command {
cmd.Flags().IntVar(&p.pluginServicePort, "plugin-service-port", p.pluginServicePort, "The port number used to run a gRPC server for plugin services.")

cmd.Flags().StringVar(&p.toolsDir, "tools-dir", p.toolsDir, "The path to directory where to install needed tools such as kubectl, helm, kustomize.")
cmd.Flags().BoolVar(&p.enableDefaultKubernetesCloudProvider, "enable-default-kubernetes-cloud-provider", p.enableDefaultKubernetesCloudProvider, "Whether the default kubernetes provider is enabled or not. This feature is deprecated.")
cmd.Flags().BoolVar(&p.addLoginUserToPasswd, "add-login-user-to-passwd", p.addLoginUserToPasswd, "Whether to add login user to $HOME/passwd. This is typically for applications running as a random user ID.")
cmd.Flags().DurationVar(&p.gracePeriod, "grace-period", p.gracePeriod, "How long to wait for graceful shutdown.")

Expand Down Expand Up @@ -607,9 +605,6 @@ func (p *piped) loadConfig(ctx context.Context) (*config.PipedSpec, error) {
if cfg.Kind != config.KindPiped {
return nil, fmt.Errorf("wrong configuration kind for piped: %v", cfg.Kind)
}
if p.enableDefaultKubernetesCloudProvider {
cfg.Spec.EnableDefaultKubernetesPlatformProvider()
}
return cfg.Spec, nil
}

Expand Down Expand Up @@ -744,18 +739,9 @@ func (p *piped) sendPipedMeta(ctx context.Context, client pipedservice.Client, c
}

req := &pipedservice.ReportPipedMetaRequest{
Version: version.Get().Version,
Config: string(maskedCfg),
Repositories: repos,
PlatformProviders: make([]*model.Piped_PlatformProvider, 0, len(cfg.PlatformProviders)),
}

// Configure the list of specified platform providers.
for _, cp := range cfg.PlatformProviders {
req.PlatformProviders = append(req.PlatformProviders, &model.Piped_PlatformProvider{
Name: cp.Name,
Type: cp.Type.String(),
})
Version: version.Get().Version,
Config: string(maskedCfg),
Repositories: repos,
}

// Configure secret management.
Expand Down
184 changes: 0 additions & 184 deletions pkg/configv1/piped.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ const (
maskString = "******"
)

var defaultKubernetesPlatformProvider = PipedPlatformProvider{
Name: "kubernetes-default",
Type: model.PlatformProviderKubernetes,
KubernetesConfig: &PlatformProviderKubernetesConfig{},
}

// PipedSpec contains configurable data used to while running Piped.
type PipedSpec struct {
// The identifier of the PipeCD project where this piped belongs to.
Expand Down Expand Up @@ -66,11 +60,6 @@ type PipedSpec struct {
ChartRepositories []HelmChartRepository `json:"chartRepositories,omitempty"`
// List of helm chart registries that should be logged in while starting up.
ChartRegistries []HelmChartRegistry `json:"chartRegistries,omitempty"`
// List of cloud providers can be used by this piped.
// Deprecated: use PlatformProvider instead.
CloudProviders []PipedPlatformProvider `json:"cloudProviders,omitempty"`
// List of platform providers can be used by this piped.
PlatformProviders []PipedPlatformProvider `json:"platformProviders,omitempty"`
// List of plugiin configs
Plugins []PipedPlugin `json:"plugins,omitempty"`
// List of analysis providers can be used by this piped.
Expand All @@ -96,9 +85,6 @@ func (s *PipedSpec) UnmarshalJSON(data []byte) error {
return err
}

// Add all CloudProviders configuration as PlatformProviders configuration.
s.PlatformProviders = append(s.PlatformProviders, ps.CloudProviders...)
s.CloudProviders = nil
return nil
}

Expand Down Expand Up @@ -188,9 +174,6 @@ func (s *PipedSpec) Mask() {
for i := 0; i < len(s.ChartRegistries); i++ {
s.ChartRegistries[i].Mask()
}
for _, p := range s.PlatformProviders {
p.Mask()
}
for _, p := range s.AnalysisProviders {
p.Mask()
}
Expand All @@ -200,67 +183,6 @@ func (s *PipedSpec) Mask() {
}
}

// EnableDefaultKubernetesPlatformProvider adds the default kubernetes cloud provider if it was not specified.
func (s *PipedSpec) EnableDefaultKubernetesPlatformProvider() {
for _, cp := range s.PlatformProviders {
if cp.Name == defaultKubernetesPlatformProvider.Name {
return
}
}
s.PlatformProviders = append(s.PlatformProviders, defaultKubernetesPlatformProvider)
}

// HasPlatformProvider checks whether the given provider is configured or not.
func (s *PipedSpec) HasPlatformProvider(name string, t model.ApplicationKind) bool {
_, contains := s.FindPlatformProvider(name, t)
return contains
}

// FindPlatformProvider finds and returns a Platform Provider by name and type.
func (s *PipedSpec) FindPlatformProvider(name string, t model.ApplicationKind) (PipedPlatformProvider, bool) {
requiredProviderType := t.CompatiblePlatformProviderType()
for _, p := range s.PlatformProviders {
if p.Name != name {
continue
}
if p.Type != requiredProviderType {
continue
}
return p, true
}
return PipedPlatformProvider{}, false
}

// FindPlatformProvidersByLabels finds all PlatformProviders which match the provided labels.
func (s *PipedSpec) FindPlatformProvidersByLabels(labels map[string]string, t model.ApplicationKind) []PipedPlatformProvider {
requiredProviderType := t.CompatiblePlatformProviderType()
out := make([]PipedPlatformProvider, 0)

labelMatch := func(providerLabels map[string]string) bool {
if len(providerLabels) < len(labels) {
return false
}

for k, v := range labels {
if v != providerLabels[k] {
return false
}
}
return true
}

for _, p := range s.PlatformProviders {
if p.Type != requiredProviderType {
continue
}
if !labelMatch(p.Labels) {
continue
}
out = append(out, p)
}
return out
}

// GetRepositoryMap returns a map of repositories where key is repo id.
func (s *PipedSpec) GetRepositoryMap() map[string]PipedRepository {
m := make(map[string]PipedRepository, len(s.Repositories))
Expand Down Expand Up @@ -536,112 +458,6 @@ func (r *HelmChartRegistry) Mask() {
}
}

type PipedPlatformProvider struct {
Name string `json:"name"`
Type model.PlatformProviderType `json:"type"`
Labels map[string]string `json:"labels,omitempty"`

KubernetesConfig *PlatformProviderKubernetesConfig
TerraformConfig *PlatformProviderTerraformConfig
CloudRunConfig *PlatformProviderCloudRunConfig
LambdaConfig *PlatformProviderLambdaConfig
ECSConfig *PlatformProviderECSConfig
}

type genericPipedPlatformProvider struct {
Name string `json:"name"`
Type model.PlatformProviderType `json:"type"`
Labels map[string]string `json:"labels,omitempty"`
Config json.RawMessage `json:"config"`
}

func (p *PipedPlatformProvider) MarshalJSON() ([]byte, error) {
var (
err error
config json.RawMessage
)

switch p.Type {
case model.PlatformProviderKubernetes:
config, err = json.Marshal(p.KubernetesConfig)
case model.PlatformProviderTerraform:
config, err = json.Marshal(p.TerraformConfig)
case model.PlatformProviderCloudRun:
config, err = json.Marshal(p.CloudRunConfig)
case model.PlatformProviderLambda:
config, err = json.Marshal(p.LambdaConfig)
case model.PlatformProviderECS:
config, err = json.Marshal(p.ECSConfig)
default:
err = fmt.Errorf("unsupported platform provider type: %s", p.Name)
}

if err != nil {
return nil, err
}

return json.Marshal(&genericPipedPlatformProvider{
Name: p.Name,
Type: p.Type,
Labels: p.Labels,
Config: config,
})
}

func (p *PipedPlatformProvider) UnmarshalJSON(data []byte) error {
var err error
gp := genericPipedPlatformProvider{}
if err = json.Unmarshal(data, &gp); err != nil {
return err
}
p.Name = gp.Name
p.Type = gp.Type
p.Labels = gp.Labels

switch p.Type {
case model.PlatformProviderKubernetes:
p.KubernetesConfig = &PlatformProviderKubernetesConfig{}
if len(gp.Config) > 0 {
err = json.Unmarshal(gp.Config, p.KubernetesConfig)
}
case model.PlatformProviderTerraform:
p.TerraformConfig = &PlatformProviderTerraformConfig{}
if len(gp.Config) > 0 {
err = json.Unmarshal(gp.Config, p.TerraformConfig)
}
case model.PlatformProviderCloudRun:
p.CloudRunConfig = &PlatformProviderCloudRunConfig{}
if len(gp.Config) > 0 {
err = json.Unmarshal(gp.Config, p.CloudRunConfig)
}
case model.PlatformProviderLambda:
p.LambdaConfig = &PlatformProviderLambdaConfig{}
if len(gp.Config) > 0 {
err = json.Unmarshal(gp.Config, p.LambdaConfig)
}
case model.PlatformProviderECS:
p.ECSConfig = &PlatformProviderECSConfig{}
if len(gp.Config) > 0 {
err = json.Unmarshal(gp.Config, p.ECSConfig)
}
default:
err = fmt.Errorf("unsupported platform provider type: %s", p.Name)
}
return err
}

func (p *PipedPlatformProvider) Mask() {
if p.CloudRunConfig != nil {
p.CloudRunConfig.Mask()
}
if p.LambdaConfig != nil {
p.LambdaConfig.Mask()
}
if p.ECSConfig != nil {
p.ECSConfig.Mask()
}
}

type PlatformProviderKubernetesConfig struct {
// The master URL of the kubernetes cluster.
// Empty means in-cluster.
Expand Down
Loading

0 comments on commit b65379f

Please sign in to comment.