Merge branch 'rich/pulsar-3.0' of github.com:richscott/armada into ri…

…ch/pulsar-3.0

.mergify.yml

@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: Require approval from Armada maintainers
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      post_check:
+        success_conditions:
+        - or:
+          - "#approved-reviews-by>=2"
+          - and: 
+            - "#approved-reviews-by>=1"
+            - "author~=^(JamesMurkin|severinson|d80tb7|carlocamurri|kannon92|dejanzele|Sharpz7|ClifHouck|robertdavidsmith|theAntiYeti|richscott|suprjinx|zuqq)"
+        title:
+          Two are checks required.

cmd/armada-load-tester/cmd/root.go

@@ -21,15 +21,7 @@ var rootCmd = &cobra.Command{
 Command line utility to submit many jobs to armada
 
 Persistent config can be saved in a config file so it doesn't have to be specified every command.
-
-Example structure:
-armadaUrl: localhost:50051
-basicAuth:
-  username: user1
-  password: password123
-
-The location of this file can be passed in using --config argument or picked from $HOME/.armadactl.yaml.
-`,
+The location of this file can be passed in using --config argument or picked from $HOME/.armadactl.yaml.`,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

cmd/testsuite/cmd/root.go

@@ -18,13 +18,6 @@ func RootCmd() *cobra.Command {
 		Long: `testsuite is a suite of automated tests for Armada deployments.
 
 Persistent config can be saved in a config file so it doesn't have to be specified every command.
-
-Example structure:
-armadaUrl: localhost:50051
-basicAuth:
-username: user1
-password: password123
-
 The location of this file can be passed in using the --config argument.
 If not provided, $HOME/.armadactl.yaml is used.`,
 	}