Fix structs to match argocd YAML files (#1084)

* CLD-8505:add metrics-server to be managed by argocd

* CLD-8505:Fix struct to match argocd yaml files

Author: andrleite

internal/provisioner/utility/unmanaged.go

@@ -219,6 +219,10 @@ func (u *unmanaged) CreateOrUpgrade() error {
 		if err := u.utiliyArgocdDeploy(u.Name()); err != nil {
 			return err
 		}
+	case model.MetricsServerCanonicalName:
+		if err := u.utiliyArgocdDeploy(u.Name()); err != nil {
+			return err
+		}
 	default:
 		u.logger.WithFields(log.Fields{
 			"unmanaged-action": "skip",

internal/tools/argocd/argocd.go

@@ -13,13 +13,15 @@ type ArgocdClusterLabels struct {
 }
 
 type ArgocdClusterRegisterParameters struct {
-	Name      string              `yaml:"name"`
-	Type      string              `yaml:"type"`
-	Labels    ArgocdClusterLabels `yaml:"labels"`
-	APIServer string              `yaml:"api_server"`
-	CertData  string              `yaml:"certData"`
-	CaData    string              `yaml:"caData"`
-	KeyData   string              `yaml:"keyData"`
+	Name          string              `yaml:"name"`
+	Type          string              `yaml:"type"`
+	Labels        ArgocdClusterLabels `yaml:"labels"`
+	APIServer     string              `yaml:"api_server"`
+	ArgoCDRoleARN string              `yaml:"argoCDRoleARN,omitempty"`
+	ClusterName   string              `yaml:"clusterName,omitempty"`
+	CertData      string              `yaml:"certData,omitempty"`
+	CaData        string              `yaml:"caData,omitempty"`
+	KeyData       string              `yaml:"keyData,omitempty"`
 }
 
 type Argock8sRegister struct {

internal/tools/argocd/argocd_apps.go

@@ -7,15 +7,16 @@ import (
 )
 
 type Application struct {
-	Name            string   `yaml:"name"`
-	Namespace       string   `yaml:"namespace"`
-	Repo            string   `yaml:"repo"`
-	Path            string   `yaml:"path"`
-	Revision        string   `yaml:"revision"`
-	Helm            Helm     `yaml:"helm"`
-	ServerSideApply bool     `yaml:"serverSideApply,omitempty"`
-	Replace         bool     `yaml:"replace,omitempty"`
-	ClusterLabels   []Labels `yaml:"cluster_labels"`
+	Name              string             `yaml:"name"`
+	Namespace         string             `yaml:"namespace"`
+	Repo              string             `yaml:"repo"`
+	Path              string             `yaml:"path"`
+	Revision          string             `yaml:"revision"`
+	Helm              Helm               `yaml:"helm"`
+	ServerSideApply   bool               `yaml:"serverSideApply,omitempty"`
+	Replace           bool               `yaml:"replace,omitempty"`
+	IgnoreDifferences []IgnoreDifference `yaml:"ignoreDifferences,omitempty"`
+	ClusterLabels     []Labels           `yaml:"cluster_labels"`
 }
 
 type Helm struct {
@@ -28,6 +29,13 @@ type Labels struct {
 	ClusterID   string `yaml:"cluster-id,omitempty"`
 }
 
+type IgnoreDifference struct {
+	Kind         string   `yaml:"kind"`
+	Name         string   `yaml:"name"`
+	Namespace    string   `yaml:"namespace"`
+	JsonPointers []string `yaml:"jsonPointers"`
+}
+
 // ReadArgoApplicationFile take a argocd application file and load it into Application struct
 func ReadArgoApplicationFile(appsFile []byte) (map[string][]Application, error) {
 	var apps map[string][]Application