Skip to content

NTHv2 core functionality #612

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

Merged
merged 13 commits into from
Apr 14, 2022
Merged

NTHv2 core functionality #612

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ac0ce04
core functionality
cjerad Apr 1, 2022
68b973e
fix capitalization
cjerad Apr 4, 2022
2beddc7
add more ways to specify AWS region
cjerad Apr 4, 2022
c4ee5fb
tidy up interface organization
cjerad Apr 4, 2022
0407de6
remove SQS request params from Terminator spec
cjerad Apr 5, 2022
69a0544
update copyright attribution
cjerad Apr 6, 2022
17c2ad0
remove boilerplate comment
cjerad Apr 6, 2022
d217816
expand "Addr" to "Address"
cjerad Apr 6, 2022
87dccd7
fix capitalization
cjerad Apr 6, 2022
6a7b44b
rename event files
cjerad Apr 7, 2022
ab10afa
add more logging for parsing failures
cjerad Apr 7, 2022
186caec
dedup lifecycle action completion code
cjerad Apr 7, 2022
ef556fc
add more test cases
cjerad Apr 7, 2022
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
Prev Previous commit
Next Next commit
expand "Addr" to "Address"
  • Loading branch information
@cjerad
cjerad committed Apr 6, 2022
commit d21781647b4f35a0997670a5fd9eeacb5cc66d47
12 changes: 6 additions & 6 deletions src/cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ var scheme = runtime.NewScheme()

type Options struct {
AWSRegion string
MetricsAddr string
MetricsAddress string
EnableLeaderElection bool
ProbeAddr string
ProbeAddress string
}

func init() {
Expand Down Expand Up @@ -109,9 +109,9 @@ func main() {

mgr, err := ctrl.NewManager(config, ctrl.Options{
Scheme: scheme,
MetricsBindAddress: options.MetricsAddr,
MetricsBindAddress: options.MetricsAddress,
Port: 9443,
HealthProbeBindAddress: options.ProbeAddr,
HealthProbeBindAddress: options.ProbeAddress,
LeaderElection: options.EnableLeaderElection,
LeaderElectionID: "aws-node-termination-handler.k8s.aws",
Logger: zapr.NewLogger(logging.FromContext(ctx).Desugar()),
Expand Down Expand Up @@ -197,8 +197,8 @@ func parseOptions() Options {
options := Options{}

flag.StringVar(&options.AWSRegion, "aws-region", os.Getenv("AWS_REGION"), "The AWS region for API calls.")
flag.StringVar(&options.MetricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&options.ProbeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
flag.StringVar(&options.MetricsAddress, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&options.ProbeAddress, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
flag.BoolVar(&options.EnableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+
"Enabling this will ensure there is only one active controller manager.")
flag.Parse()
Expand Down