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: ack-eks-controller to v1.4.5 #236

Merged
merged 1 commit into from
Sep 6, 2024
Merged

update: ack-eks-controller to v1.4.5 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions pkg/application/ack/eks_controller/eks_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
// Helm: https://github.com/aws-controllers-k8s/eks-controller/tree/main/helm
// Chart: https://gallery.ecr.aws/aws-controllers-k8s/eks-chart
// Repo: https://gallery.ecr.aws/aws-controllers-k8s/eks-controller
// Version: Latest is v1.0.2 (as of 6/11/23)
// Version: Latest is v1.4.5 (as of 9/5/24)

func NewApp() *application.Application {
app := &application.Application{
return &application.Application{
Command: cmd.Command{
Parent: "ack",
Name: "eks-controller",
Expand All @@ -32,7 +32,6 @@ func NewApp() *application.Application {
CommonOptions: resource.CommonOptions{
Name: "ack-eks-controller-irsa",
},
// https://github.com/aws-controllers-k8s/eks-controller/blob/main/config/iam/recommended-inline-policy
PolicyType: irsa.PolicyDocument,
PolicyDocTemplate: &template.TextTemplate{
Template: policyDocTemplate,
Expand All @@ -44,10 +43,10 @@ func NewApp() *application.Application {
Namespace: "ack-system",
ServiceAccount: "ack-eks-controller",
DefaultVersion: &application.LatestPrevious{
LatestChart: "1.0.2",
Latest: "1.0.2",
PreviousChart: "v0.1.7",
Previous: "v0.1.7",
LatestChart: "1.4.5",
Latest: "1.4.5",
PreviousChart: "1.0.2",
Previous: "1.0.2",
},
},

Expand All @@ -59,9 +58,9 @@ func NewApp() *application.Application {
},
},
}
return app
}

// https://github.com/aws-controllers-k8s/eks-controller/blob/main/config/iam/recommended-inline-policy
const policyDocTemplate = `
Version: '2012-10-17'
Statement:
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (r *Resource) NewCreateCmd() *cobra.Command {

if len(r.CreateArgs) > 0 && r.Common().CreateArgumentOptional {
use += " " + "[" + r.Args[0] + "]"
} else if len(r.Args) > 0 {
} else if len(r.CreateArgs) > 0 {
use += " " + strings.Join(r.CreateArgs, " ")
}

Expand Down