From 5ff7bbb3f65674d3515cd4f8d173ce30a06df058 Mon Sep 17 00:00:00 2001 From: Aaron Miller <1521726+aaroniscode@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:21:01 -0700 Subject: [PATCH] update: `cert-manager` to v1.15.3 (#247) --- cmd/install/install.go | 4 ++-- cmd/install/uninstall.go | 4 ++-- .../cert_manager.go | 24 ++++++++++--------- .../cluster_issuer.go | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) rename pkg/application/{cert_manager => certmanager}/cert_manager.go (82%) rename pkg/application/{cert_manager => certmanager}/cluster_issuer.go (97%) diff --git a/cmd/install/install.go b/cmd/install/install.go index 5ccd420..5ae16ae 100644 --- a/cmd/install/install.go +++ b/cmd/install/install.go @@ -8,7 +8,7 @@ import ( "github.com/awslabs/eksdemo/pkg/application/autoscaling/cluster_autoscaler" awslbc "github.com/awslabs/eksdemo/pkg/application/aws/lbc" "github.com/awslabs/eksdemo/pkg/application/aws_fluent_bit" - "github.com/awslabs/eksdemo/pkg/application/cert_manager" + "github.com/awslabs/eksdemo/pkg/application/certmanager" "github.com/awslabs/eksdemo/pkg/application/cilium" "github.com/awslabs/eksdemo/pkg/application/consul" "github.com/awslabs/eksdemo/pkg/application/coredumphandler" @@ -52,7 +52,7 @@ func NewInstallCmd() *cobra.Command { cmd.AddCommand(NewInstallAliasCmds(autoscalingApps, "as-")...) cmd.AddCommand(aws_fluent_bit.NewApp().NewInstallCmd()) cmd.AddCommand(awslbc.NewApp().NewInstallCmd()) - cmd.AddCommand(cert_manager.NewApp().NewInstallCmd()) + cmd.AddCommand(certmanager.NewApp().NewInstallCmd()) cmd.AddCommand(cilium.NewApp().NewInstallCmd()) cmd.AddCommand(consul.NewApp().NewInstallCmd()) cmd.AddCommand(NewInstallContainerInsightsCmd()) diff --git a/cmd/install/uninstall.go b/cmd/install/uninstall.go index 0e16f4d..b5455f0 100644 --- a/cmd/install/uninstall.go +++ b/cmd/install/uninstall.go @@ -8,7 +8,7 @@ import ( "github.com/awslabs/eksdemo/pkg/application/autoscaling/cluster_autoscaler" awslbc "github.com/awslabs/eksdemo/pkg/application/aws/lbc" "github.com/awslabs/eksdemo/pkg/application/aws_fluent_bit" - "github.com/awslabs/eksdemo/pkg/application/cert_manager" + "github.com/awslabs/eksdemo/pkg/application/certmanager" "github.com/awslabs/eksdemo/pkg/application/cilium" "github.com/awslabs/eksdemo/pkg/application/consul" "github.com/awslabs/eksdemo/pkg/application/coredumphandler" @@ -52,7 +52,7 @@ func NewUninstallCmd() *cobra.Command { cmd.AddCommand(NewUninstallAliasCmds(autoscalingApps, "as-")...) cmd.AddCommand(aws_fluent_bit.NewApp().NewUninstallCmd()) cmd.AddCommand(awslbc.NewApp().NewUninstallCmd()) - cmd.AddCommand(cert_manager.NewApp().NewUninstallCmd()) + cmd.AddCommand(certmanager.NewApp().NewUninstallCmd()) cmd.AddCommand(cilium.NewApp().NewUninstallCmd()) cmd.AddCommand(consul.NewApp().NewUninstallCmd()) cmd.AddCommand(NewUninstallContainerInsightsCmd()) diff --git a/pkg/application/cert_manager/cert_manager.go b/pkg/application/certmanager/cert_manager.go similarity index 82% rename from pkg/application/cert_manager/cert_manager.go rename to pkg/application/certmanager/cert_manager.go index 3c8a6f3..d87c12b 100644 --- a/pkg/application/cert_manager/cert_manager.go +++ b/pkg/application/certmanager/cert_manager.go @@ -1,4 +1,4 @@ -package cert_manager +package certmanager import ( "github.com/awslabs/eksdemo/pkg/application" @@ -13,10 +13,10 @@ import ( // GitHub: https://github.com/cert-manager/cert-manager // Helm: https://github.com/cert-manager/cert-manager/tree/master/deploy/charts/cert-manager // Repo: quay.io/jetstack/cert-manager-controller -// Version: Latest is v1.12.1 (as of 5/30/23) +// Version: Latest is v1.15.3 (as of 9/8/24) func NewApp() *application.Application { - app := &application.Application{ + return &application.Application{ Command: cmd.Command{ Name: "cert-manager", Description: "Cloud Native Certificate Management", @@ -40,10 +40,10 @@ func NewApp() *application.Application { ServiceAccount: "cert-manager", DefaultVersion: &application.LatestPrevious{ // For Helm Chart version: https://artifacthub.io/packages/helm/cert-manager/cert-manager - LatestChart: "1.12.1", - Latest: "v1.12.1", - PreviousChart: "1.11.0", - Previous: "v1.11.0", + LatestChart: "1.15.3", + Latest: "v1.15.3", + PreviousChart: "1.12.1", + Previous: "v1.12.1", }, }, @@ -60,20 +60,22 @@ func NewApp() *application.Application { clusterIssuer(), }, } - return app } +// https://github.com/cert-manager/cert-manager/blob/master/deploy/charts/cert-manager/values.yaml const valuesTemplate = `--- -installCRDs: true +crds: + enabled: true replicaCount: 1 +image: + tag: {{ .Version }} serviceAccount: name: {{ .ServiceAccount }} annotations: {{ .IrsaAnnotation }} -image: - tag: {{ .Version }} ` +// https://github.com/cert-manager/website/blob/master/content/docs/configuration/acme/dns01/route53.md#set-up-an-iam-role const policyDocument = ` Version: '2012-10-17' Statement: diff --git a/pkg/application/cert_manager/cluster_issuer.go b/pkg/application/certmanager/cluster_issuer.go similarity index 97% rename from pkg/application/cert_manager/cluster_issuer.go rename to pkg/application/certmanager/cluster_issuer.go index f2f7510..df6632d 100644 --- a/pkg/application/cert_manager/cluster_issuer.go +++ b/pkg/application/certmanager/cluster_issuer.go @@ -1,4 +1,4 @@ -package cert_manager +package certmanager import ( "github.com/awslabs/eksdemo/pkg/manifest"