From 5efbbce6c7aab69b798ec52bdc3b00fefe1225cc Mon Sep 17 00:00:00 2001 From: lenhattan86 Date: Wed, 30 Sep 2020 16:32:53 -0700 Subject: [PATCH 1/4] skip monitoring create/kill jobs (#13) Added flag -m and --monitor that can be set in order to monitor a job creation or a job kill. By default monitor is set to true. --- cmd/create.go | 20 +++++++++++--------- cmd/kill.go | 8 +++++--- cmd/root.go | 1 + 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cmd/create.go b/cmd/create.go index c062c4c..fd95efc 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -21,13 +21,14 @@ import ( func init() { rootCmd.AddCommand(createCmd) + createCmd.Flags().BoolVarP(&monitor, "monitor", "m", false, "monitor the result after sending the command") } var createCmd = &cobra.Command{ Use: "create", Short: "Create an Aurora Job", Run: createJob, - Args: cobra.ExactArgs(1), + Args: cobra.RangeArgs(1, 2), } func createJob(cmd *cobra.Command, args []string) { @@ -46,14 +47,15 @@ func createJob(cmd *cobra.Command, args []string) { log.Fatal("unable to create Aurora job: ", err) } - if ok, monitorErr := client.MonitorInstances(auroraJob.JobKey(), - auroraJob.GetInstanceCount(), - 5, - 50); !ok || monitorErr != nil { - if err := client.KillJob(auroraJob.JobKey()); err != nil { - log.Fatal(monitorErr, err) + if monitor { + if ok, monitorErr := client.MonitorInstances(auroraJob.JobKey(), + auroraJob.GetInstanceCount(), + 5, + 50); !ok || monitorErr != nil { + if err := client.KillJob(auroraJob.JobKey()); err != nil { + log.Fatal(monitorErr, err) + } + log.Fatal(monitorErr) } - log.Fatal(monitorErr) } - } diff --git a/cmd/kill.go b/cmd/kill.go index 3c3542b..0eb46c1 100644 --- a/cmd/kill.go +++ b/cmd/kill.go @@ -30,6 +30,7 @@ func init() { killJobCmd.Flags().StringVarP(env, "environment", "e", "", "Aurora Environment") killJobCmd.Flags().StringVarP(role, "role", "r", "", "Aurora Role") killJobCmd.Flags().StringVarP(name, "name", "n", "", "Aurora Name") + killJobCmd.Flags().BoolVarP(&monitor, "monitor", "m", false, "monitor the result after sending the command") killJobCmd.MarkFlagRequired("environment") killJobCmd.MarkFlagRequired("role") killJobCmd.MarkFlagRequired("name") @@ -57,8 +58,9 @@ func killJob(cmd *cobra.Command, args []string) { if err != nil { log.Fatalln(err) } - - if ok, err := client.MonitorInstances(job.JobKey(), 0, 5, 50); !ok || err != nil { - log.Fatalln("Unable to kill all instances of job") + if monitor { + if ok, err := client.MonitorInstances(job.JobKey(), 0, 5, 50); !ok || err != nil { + log.Fatalln("Unable to kill all instances of job") + } } } diff --git a/cmd/root.go b/cmd/root.go index ad50772..671cd30 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -46,6 +46,7 @@ var count int64 var filename string var message = new(string) var updateID string +var monitor bool var log = logrus.New() const australisVer = "v0.22.0" From deaddd29531da8db16a50eff578596f1236a60f4 Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Wed, 30 Sep 2020 16:15:21 -0700 Subject: [PATCH 2/4] Bumping up release number in root.go so that version command returns the right version. Fixing some bugs in the debian packaging scripts. Bumping up golang version we're building with to 1.15.2 --- cmd/root.go | 2 +- deb-packaging/Dockerfile | 2 +- deb-packaging/build_deb.sh | 2 +- deb-packaging/entrypoint.sh | 5 +---- debian/changelog | 14 +++++++++++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 671cd30..6e503cf 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -49,7 +49,7 @@ var updateID string var monitor bool var log = logrus.New() -const australisVer = "v0.22.0" +const australisVer = "v1.0.0" var forceDrainTimeout time.Duration diff --git a/deb-packaging/Dockerfile b/deb-packaging/Dockerfile index ab6b14e..6088aa8 100644 --- a/deb-packaging/Dockerfile +++ b/deb-packaging/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 RUN apt-get update -y && \ apt-get install -y build-essential devscripts dh-exec dh-make git lintian wget && \ - wget https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz -O /tmp/go.tar.gz + wget https://dl.google.com/go/go1.15.2.linux-amd64.tar.gz -O /tmp/go.tar.gz RUN tar -C /usr/local -xzf /tmp/go.tar.gz diff --git a/deb-packaging/build_deb.sh b/deb-packaging/build_deb.sh index 6906d3d..958eaa8 100644 --- a/deb-packaging/build_deb.sh +++ b/deb-packaging/build_deb.sh @@ -2,4 +2,4 @@ docker build . -t australis_deb_builder -docker run --rm -v $HOME/go/pkg/mod:/go/pkg/mod -v $(pwd)/..:/australis australis_builder +docker run --rm -v $HOME/go/pkg/mod:/go/pkg/mod -v $(pwd)/..:/australis australis_deb_builder diff --git a/deb-packaging/entrypoint.sh b/deb-packaging/entrypoint.sh index b871d59..601733e 100755 --- a/deb-packaging/entrypoint.sh +++ b/deb-packaging/entrypoint.sh @@ -1,12 +1,9 @@ #!/bin/bash -# Temporary fix for a go mods bug -rm /australis/go.sum - # Build debian package cd /australis debuild -d -us -uc -b # Move resulting packages to the dist folder mkdir -p /australis/dist -mv /australis_*_amd64* /australis/dist \ No newline at end of file +mv /australis_*_amd64* /australis/dist diff --git a/debian/changelog b/debian/changelog index 50dc650..0677aa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,16 @@ -australis (0.1.2) unstable; urgency=medium +australis (1.0.0) stable; urgency=medium - * Unreleased + * First stable release. - -- Renan DelValle Mon, 19 Feb 2020 12:00:00 -0700 + -- Renan Del Valle Wed, 30 Sep 2020 15:39:29 -0700 + +australis (0.22.0) unstable; urgency=medium + + * Added support for starting job updates. + * Added support for setting SlaAwareness for updates. + * Added upport for scheduling cron jobs. + + -- Renan Del Valle Thu, 07 May 2020 12:00:00 -0700 australis (0.1.1) unstable; urgency=medium From d5d19cf4486648e283cf86eab76ee5467736c725 Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Wed, 30 Sep 2020 16:46:14 -0700 Subject: [PATCH 3/4] Changing default value of monitor to true. --- cmd/create.go | 2 +- cmd/kill.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/create.go b/cmd/create.go index fd95efc..6ea8b93 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -21,7 +21,7 @@ import ( func init() { rootCmd.AddCommand(createCmd) - createCmd.Flags().BoolVarP(&monitor, "monitor", "m", false, "monitor the result after sending the command") + createCmd.Flags().BoolVarP(&monitor, "monitor", "m", true, "monitor the result after sending the command") } var createCmd = &cobra.Command{ diff --git a/cmd/kill.go b/cmd/kill.go index 0eb46c1..88d1d9f 100644 --- a/cmd/kill.go +++ b/cmd/kill.go @@ -30,7 +30,7 @@ func init() { killJobCmd.Flags().StringVarP(env, "environment", "e", "", "Aurora Environment") killJobCmd.Flags().StringVarP(role, "role", "r", "", "Aurora Role") killJobCmd.Flags().StringVarP(name, "name", "n", "", "Aurora Name") - killJobCmd.Flags().BoolVarP(&monitor, "monitor", "m", false, "monitor the result after sending the command") + killJobCmd.Flags().BoolVarP(&monitor, "monitor", "m", true, "monitor the result after sending the command") killJobCmd.MarkFlagRequired("environment") killJobCmd.MarkFlagRequired("role") killJobCmd.MarkFlagRequired("name") From 2a76e3e2b4e75ee6480466109cb7db8d0c04e8d3 Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Wed, 30 Sep 2020 16:47:53 -0700 Subject: [PATCH 4/4] 1.0.1 release --- cmd/root.go | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/root.go b/cmd/root.go index 6e503cf..d91a48b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -49,7 +49,7 @@ var updateID string var monitor bool var log = logrus.New() -const australisVer = "v1.0.0" +const australisVer = "v1.0.1" var forceDrainTimeout time.Duration diff --git a/debian/changelog b/debian/changelog index 0677aa4..96a761f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +australis (1.0.1) stable; urgency=medium + + * Added flag -m and --monitor that can be set in order to monitor a job creation or a job kill. By default monitor is set to true. + + -- Renan Del Valle Wed, 30 Sep 2020 16:46:56 -0700 + australis (1.0.0) stable; urgency=medium * First stable release.