feat(ambassador): ambassador upgrade to aes without cert-manager

Upgrade of ambassador to ambassador edge stack v1.0.0, with this version it is no longer necessary to have cert-manager for the management of the certificates

api/v1beta1/metrics.go

@@ -7,5 +7,5 @@ type Metrics struct {
 	PrometheusNodeExporter bool `json:"prometheus-node-exporter"`
 	APIServer              bool `json:"api-server"`
 	PrometheusOperator     bool `json:"prometheus-operator"`
-	LoggingOperator        bool `json"logging-operator"`
+	LoggingOperator        bool `json:"logging-operator"`
 }

api/v1beta1/toolset_types.go

@@ -30,7 +30,6 @@ type ToolsetSpec struct {
 	LoggingOperator        *LoggingOperator        `json:"logging-operator,omitempty" yaml:"logging-operator"`
 	PrometheusNodeExporter *PrometheusNodeExporter `json:"prometheus-node-exporter,omitempty" yaml:"prometheus-node-exporter"`
 	Grafana                *Grafana                `json:"grafana,omitempty" yaml:"grafana"`
-	CertManager            *CertManager            `json:"cert-manager,omitempty" yaml:"cert-manager"`
 	Ambassador             *Ambassador             `json:"ambassador,omitempty" yaml:"ambassador"`
 	KubeStateMetrics       *KubeStateMetrics       `json:"kube-state-metrics,omitempty" yaml:"kube-state-metrics"`
 	Argocd                 *Argocd                 `json:"argocd,omitempty" yaml:"argocd"`

config/crd/bases/toolsets.boom.caos.ch_toolsets.yaml

@@ -56,17 +56,6 @@ spec:
                 prefix:
                   type: string
               type: object
-            cert-manager:
-              properties:
-                deploy:
-                  type: boolean
-                namespace:
-                  type: string
-                prefix:
-                  type: string
-                replicaCount:
-                  type: integer
-              type: object
             grafana:
               properties:
                 admin:
@@ -173,6 +162,8 @@ spec:
                 replicaCount:
                   type: integer
               type: object
+            kubeVersion:
+              type: string
             logging-operator:
               properties:
                 deploy:
@@ -182,8 +173,31 @@ spec:
                 prefix:
                   type: string
               type: object
-            name:
-              type: string
+            metrics:
+              properties:
+                ambassador:
+                  type: boolean
+                api-server:
+                  type: boolean
+                argocd:
+                  type: boolean
+                kube-state-metrics:
+                  type: boolean
+                logging-operator:
+                  type: boolean
+                prometheus-node-exporter:
+                  type: boolean
+                prometheus-operator:
+                  type: boolean
+              required:
+              - ambassador
+              - api-server
+              - argocd
+              - kube-state-metrics
+              - logging-operator
+              - prometheus-node-exporter
+              - prometheus-operator
+              type: object
             namespace:
               type: string
             prometheus-node-exporter:

internal/bundle/application/application.go

@@ -4,7 +4,6 @@ import (
 	"github.com/caos/boom/api/v1beta1"
 	"github.com/caos/boom/internal/bundle/application/applications/ambassador"
 	"github.com/caos/boom/internal/bundle/application/applications/argocd"
-	"github.com/caos/boom/internal/bundle/application/applications/certmanager"
 	"github.com/caos/boom/internal/bundle/application/applications/grafana"
 	"github.com/caos/boom/internal/bundle/application/applications/kubestatemetrics"
 	"github.com/caos/boom/internal/bundle/application/applications/loggingoperator"
@@ -43,8 +42,6 @@ func New(logger logging.Logger, appName name.Application) Application {
 		return ambassador.New(logger)
 	case argocd.GetName():
 		return argocd.New(logger)
-	case certmanager.GetName():
-		return certmanager.New(logger)
 	case grafana.GetName():
 		return grafana.New(logger)
 	case kubestatemetrics.GetName():

internal/bundle/application/applications/ambassador/helm/default.go

@@ -5,79 +5,90 @@ func DefaultValues(imageTags map[string]string) *Values {
 
 	return &Values{
 		FullnameOverride: "ambassador",
-		ReplicaCount:     3,
-		DaemonSet:        false,
+		AdminService: &AdminService{
+			Annotations: adminAnnotations,
+			Create:      true,
+			Port:        8877,
+			Type:        "ClusterIP",
+		},
+		AuthService: &AuthService{
+			Create: true,
+		},
 		Autoscaling: &Autoscaling{
-			Enabled:     false,
-			MinReplicas: 2,
-			MaxReplicas: 5,
+			Enabled: false,
 		},
-		Env: map[string]string{
-			"STATSD_ENABLED": "true",
-			"STATSD_HOST":    "localhost",
+		Crds: &Crds{
+			Create:  true,
+			Enabled: true,
+			Keep:    true,
 		},
-		SecurityContext: &SecurityContext{
-			RunAsUser: 8888,
+		DaemonSet: false,
+		DeploymentStrategy: &DeploymentStrategy{
+			Type: "RollingUpdate",
 		},
+		DNSPolicy:   "ClusterFirst",
+		HostNetwork: false,
 		Image: &Image{
-			Repository: "quay.io/datawire/ambassador",
-			Tag:        imageTags["quay.io/datawire/ambassador"],
 			PullPolicy: "IfNotPresent",
+			Repository: "quay.io/datawire/aes",
+			Tag:        imageTags["quay.io/datawire/aes"],
+		},
+		LicenseKey: &LicenseKey{
+			CreateSecret: true,
+		},
+		LivenessProbe: &LivenessProbe{
+			FailureThreshold:    3,
+			InitialDelaySeconds: 30,
+			PeriodSeconds:       3,
+		},
+		PrometheusExporter: &PrometheusExporter{
+			Enabled:    false,
+			PullPolicy: "IfNotPresent",
+			Repository: "prom/statsd-exporter",
+			Tag:        imageTags["prom/statsd-exporter"],
+		},
+		RateLimit: &RateLimit{
+			Create: true,
+		},
+		Rbac: &Rbac{
+			Create: true,
+		},
+		ReadinessProbe: &ReadinessProbe{
+			FailureThreshold:    3,
+			InitialDelaySeconds: 30,
+			PeriodSeconds:       3,
+		},
+		Redis: &Redis{
+			Create: true,
+			Annotations: &RedisAnnotations{
+				Deployment: map[string]string{},
+				Service:    map[string]string{},
+			},
+		},
+		ReplicaCount: 3,
+		Scope: &Scope{
+			SingleNamespace: false,
+		},
+		SecurityContext: &SecurityContext{
+			RunAsUser: 8888,
 		},
-		DNSPolicy:   "ClusterFirst",
-		HostNetwork: false,
 		Service: &Service{
-			Type: "NodePort",
 			Ports: []*Port{
 				&Port{
 					Name:       "http",
 					Port:       80,
 					TargetPort: 8080,
-					NodePort:   30080,
-				}, &Port{
+				},
+				&Port{
 					Name:       "https",
 					Port:       443,
 					TargetPort: 8443,
-					NodePort:   30443,
 				},
 			},
-			Annotations: make(map[string]string, 0),
-		},
-		AdminService: &AdminService{
-			Create:      true,
-			Type:        "ClusterIP",
-			Port:        8877,
-			Annotations: adminAnnotations,
-		},
-		Rbac: &Rbac{
-			Create: true,
-		},
-		Scope: &Scope{
-			SingleNamespace: false,
 		},
 		ServiceAccount: &ServiceAccount{
 			Create: true,
 		},
-		Crds: &Crds{
-			Enabled: true,
-			Create:  true,
-			Keep:    true,
-		},
-		Pro: &Pro{
-			Enabled: false,
-			Image: &Image{
-				Repository: "quay.io/datawire/ambassador_pro",
-				Tag:        imageTags["quay.io/datawire/ambassador_pro"],
-				PullPolicy: "IfNotPresent",
-			},
-		},
-		PrometheusExporter: &PrometheusExporter{
-			Enabled:       true,
-			Repository:    "prom/statsd-exporter",
-			Tag:           imageTags["prom/statsd-exporter"],
-			PullPolicy:    "IfNotPresent",
-			Configuration: defaultExporterConfig(),
-		},
 	}
 }
 

internal/bundle/application/applications/ambassador/helm/helm.go

@@ -5,14 +5,17 @@ import "github.com/caos/boom/internal/templator/helm/chart"
 func GetChartInfo() *chart.Chart {
 	return &chart.Chart{
 		Name:    "ambassador",
-		Version: "5.3.0",
+		Version: "6.0.0",
+		Index: &chart.Index{
+			Name: "datawire",
+			URL:  "www.getambassador.io",
+		},
 	}
 }
 
 func GetImageTags() map[string]string {
 	return map[string]string{
-		"quay.io/datawire/ambassador":     "0.86.1",
-		"quay.io/datawire/ambassador_pro": "0.11.0",
-		"prom/statsd-exporter":            "v0.9.0",
+		"quay.io/datawire/aes": "1.0.0",
+		"prom/statsd-exporter": "v0.8.1",
 	}
 }