Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update: argo-cd to v2.12.3 #194

Merged
merged 2 commits into from
Sep 9, 2024
Merged

update: argo-cd to v2.12.3 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc4a9c
initial commiit
Jul 15, 2024
f849b20
rebase
aaroniscode Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/install/argo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package install

import (
"github.com/awslabs/eksdemo/pkg/application"
"github.com/awslabs/eksdemo/pkg/application/argo/argo_cd"
"github.com/awslabs/eksdemo/pkg/application/argo/cd"
"github.com/awslabs/eksdemo/pkg/application/argo/workflows"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -43,7 +43,7 @@ func NewUninstallArgoCmd() *cobra.Command {

func init() {
argoApps = []func() *application.Application{
argo_cd.NewApp,
cd.NewApp,
workflows.NewApp,
workflows.NewAppWithCognito,
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package install
import (
"github.com/awslabs/eksdemo/pkg/application"
"github.com/awslabs/eksdemo/pkg/application/adot"
"github.com/awslabs/eksdemo/pkg/application/argo/argo_cd"
"github.com/awslabs/eksdemo/pkg/application/argo/cd"
"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"
Expand Down Expand Up @@ -102,7 +102,7 @@ func NewInstallCmd() *cobra.Command {
cmd.AddCommand(vpclattice.NewApp().NewInstallCmd())

// Hidden commands for popular apps without using the group
cmd.AddCommand(NewInstallAliasCmds([]func() *application.Application{argo_cd.NewApp}, "argo")...)
cmd.AddCommand(NewInstallAliasCmds([]func() *application.Application{cd.NewApp}, "argo")...)
cmd.AddCommand(NewInstallAliasCmds([]func() *application.Application{cluster_autoscaler.NewApp}, "")...)
cmd.AddCommand(NewInstallAliasCmds([]func() *application.Application{ebs_csi.NewApp}, "")...)

Expand Down
4 changes: 2 additions & 2 deletions cmd/install/uninstall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package install
import (
"github.com/awslabs/eksdemo/pkg/application"
"github.com/awslabs/eksdemo/pkg/application/adot"
"github.com/awslabs/eksdemo/pkg/application/argo/argo_cd"
"github.com/awslabs/eksdemo/pkg/application/argo/cd"
"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"
Expand Down Expand Up @@ -102,7 +102,7 @@ func NewUninstallCmd() *cobra.Command {
cmd.AddCommand(vpclattice.NewApp().NewUninstallCmd())

// Hidden commands for popular apps without using the group
cmd.AddCommand(NewUninstallAliasCmds([]func() *application.Application{argo_cd.NewApp}, "argo")...)
cmd.AddCommand(NewUninstallAliasCmds([]func() *application.Application{cd.NewApp}, "argo")...)
cmd.AddCommand(NewUninstallAliasCmds([]func() *application.Application{cluster_autoscaler.NewApp}, "")...)
cmd.AddCommand(NewUninstallAliasCmds([]func() *application.Application{ebs_csi.NewApp}, "")...)

Expand Down
36 changes: 19 additions & 17 deletions pkg/application/argo/argo_cd/argo_cd.go → pkg/application/argo/cd/argo_cd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package argo_cd
package cd

import (
"github.com/awslabs/eksdemo/pkg/application"
Expand All @@ -11,7 +11,7 @@ import (
// GitHub: https://github.com/argoproj/argo-cd
// Helm: https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
// Repo: quay.io/argoproj/argocd
// Version: Latest Chart is 5.37.0, Argo CD v2.7.7 (as of 7/5/23)
// Version: Latest Chart is 7.5.2, Argo CD v2.12.3 (as of 9/8/24)

func NewApp() *application.Application {
app := &application.Application{
Expand Down Expand Up @@ -40,36 +40,38 @@ fullnameOverride: argocd
global:
image:
tag: {{ .Version }}
configs:
{{- if .IngressHost }}
params:
server.insecure: true
{{- end }}
secret:
# -- Bcrypt hashed admin password
argocdServerAdminPassword: "{{ .AdminPassword | bcrypt }}"
server:
service:
type: {{ .ServiceType }}
{{- if .IngressHost }}
extraArgs:
- --insecure
ingress:
enabled: true
{{- if eq .IngressClass "alb" }}
controller: aws
aws:
serviceType: {{ .ServiceType }}
{{- end }}
annotations:
{{- .IngressAnnotations | nindent 6 }}
ingressClassName: {{ .IngressClass }}
hosts:
- {{ .IngressHost }}
tls:
hostname: {{ .IngressHost }}
extraTls:
- hosts:
- {{ .IngressHost }}
{{- if ne .IngressClass "alb" }}
secretName: argocd-server-tls
{{- end}}
{{- if eq .IngressClass "alb" }}
ingressGrpc:
enabled: true
isAWSALB: true
awsALB:
serviceType: ClusterIP
backendProtocolVersion: GRPC
#ingressGrpc:
# enabled: true
{{- end }}
{{- end }}
configs:
secret:
# -- Bcrypt hashed admin password
argocdServerAdminPassword: "{{ .AdminPassword | bcrypt }}"
`
10 changes: 5 additions & 5 deletions pkg/application/argo/argo_cd/options.go → pkg/application/argo/cd/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package argo_cd
package cd

import (
"github.com/awslabs/eksdemo/pkg/application"
Expand All @@ -15,10 +15,10 @@ func newOptions() (options *ArgoCdOptions, flags cmd.Flags) {
options = &ArgoCdOptions{
ApplicationOptions: application.ApplicationOptions{
DefaultVersion: &application.LatestPrevious{
LatestChart: "5.37.0",
Latest: "v2.7.7",
PreviousChart: "4.9.14",
Previous: "v2.4.6",
LatestChart: "7.5.2",
Latest: "v2.12.3",
PreviousChart: "7.5.2",
Previous: "v2.12.3",
},
DisableServiceAccountFlag: true,
ExposeIngressAndLoadBalancer: true,
Expand Down