Merge branch 'master' into raaj-patel/create_job_error

richscott · Oct 30, 2023 · 764cc94 · 764cc94
2 parents 5b5fd9e + 26efed5
commit 764cc94
Show file tree

Hide file tree

Showing 217 changed files with 1,692 additions and 31,460 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -83,15 +83,6 @@ builds:
       - linux
     goarch:
       - amd64
-  - env: [CGO_ENABLED=0]
-    id: lookout
-    binary: lookout
-    main: ./cmd/lookout/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
-    goos:
-      - linux
-    goarch:
-      - amd64
   - env: [CGO_ENABLED=0]
     id: lookoutv2
     binary: lookoutv2
@@ -101,15 +92,6 @@ builds:
       - linux
     goarch:
       - amd64
-  - env: [CGO_ENABLED=0]
-    id: lookoutingester
-    binary: lookoutingester
-    main: ./cmd/lookoutingester/main.go
-    mod_timestamp: '{{ .CommitTimestamp }}'
-    goos:
-      - linux
-    goarch:
-      - amd64
   - env: [CGO_ENABLED=0]
     id: lookoutingesterv2
     binary: lookoutingesterv2
@@ -260,21 +242,14 @@ dockers:
       - "{{ .Env.DOCKER_REPO }}armada-lookout-bundle:{{ .Version }}"
     build_flag_templates: *BUILD_FLAG_TEMPLATES
     ids:
-      - lookout
       - lookoutv2
-      - lookoutingester
       - lookoutingesterv2
     extra_files:
-      - config/lookout/config.yaml
-      - config/lookoutingester/config.yaml
       - config/lookoutv2/config.yaml
       - config/lookoutingesterv2/config.yaml
       - internal/lookout/ui
       - pkg/api/api.swagger.json
-      - pkg/api/lookout/api.swagger.json
       - pkg/api/binoculars/api.swagger.json
-      - config/lookout/config.yaml
-      - config/lookoutingester/config.yaml
     dockerfile: ./build_goreleaser/bundles/lookout/Dockerfile
 
   - id: full-bundle
@@ -294,9 +269,7 @@ dockers:
       - armadactl
       - scheduler
       - scheduleringester
-      - lookout
       - lookoutv2
-      - lookoutingester
       - lookoutingesterv2
       - fakeexecutor
     extra_files:
@@ -306,17 +279,12 @@ dockers:
       - config/eventingester/config.yaml
       - config/scheduler/config.yaml
       - config/scheduleringester/config.yaml
-      - config/lookout/config.yaml
-      - config/lookoutingester/config.yaml
       - config/lookoutv2/config.yaml
       - config/lookoutingesterv2/config.yaml
       - config/jobservice/config.yaml
       - internal/lookout/ui
       - pkg/api/api.swagger.json
-      - pkg/api/lookout/api.swagger.json
       - pkg/api/binoculars/api.swagger.json
-      - config/lookout/config.yaml
-      - config/lookoutingester/config.yaml
     dockerfile: ./build_goreleaser/bundles/full/Dockerfile
 
   - id: server
@@ -385,20 +353,6 @@ dockers:
       - testsuite
     dockerfile: ./build_goreleaser/testsuite/Dockerfile
 
-  - id: lookoutingester
-    use: buildx
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "{{ .Env.DOCKER_REPO }}armada-lookout-ingester:latest"
-      - "{{ .Env.DOCKER_REPO }}armada-lookout-ingester:{{ .Version }}"
-    build_flag_templates: *BUILD_FLAG_TEMPLATES
-    ids:
-      - lookoutingester
-    extra_files:
-      - config/lookoutingester/config.yaml
-    dockerfile: ./build_goreleaser/lookoutingester/Dockerfile
-
   - id: lookoutingesterv2
     use: buildx
     goos: linux
@@ -413,26 +367,6 @@ dockers:
       - config/lookoutingesterv2/config.yaml
     dockerfile: ./build_goreleaser/lookoutingesterv2/Dockerfile
 
-  - id: lookout
-    use: buildx
-    goos: linux
-    goarch: amd64
-    image_templates:
-      - "{{ .Env.DOCKER_REPO }}armada-lookout:latest"
-      - "{{ .Env.DOCKER_REPO }}armada-lookout:{{ .Version }}"
-    build_flag_templates: *BUILD_FLAG_TEMPLATES
-    ids:
-      - lookout
-      - lookoutingester
-    extra_files:
-      - internal/lookout/ui
-      - pkg/api/api.swagger.json
-      - pkg/api/lookout/api.swagger.json
-      - pkg/api/binoculars/api.swagger.json
-      - config/lookout/config.yaml
-      - config/lookoutingester/config.yaml
-    dockerfile: ./build_goreleaser/lookout/Dockerfile
-
   - id: lookoutv2
     use: buildx
     goos: linux
@@ -592,15 +526,9 @@ release:
     #### Armada Executor
     - `docker pull {{ .Env.DOCKER_REPO }}armada-executor:{{ .Version }}`
     - `docker pull {{ .Env.DOCKER_REPO }}armada-executor:latest`
-    #### Armada Lookout
-    - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout:{{ .Version }}`
-    - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout:latest`
     #### Armada Lookout V2
     - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-v2:{{ .Version }}`
     - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-v2:latest`
-    #### Armada Lookout Ingester
-    - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester:{{ .Version }}`
-    - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester:latest`
     #### Armada Lookout Ingester V2
     - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:{{ .Version }}`
     - `docker pull {{ .Env.DOCKER_REPO }}armada-lookout-ingester-v2:latest`

diff --git a/README.md b/README.md
@@ -64,5 +64,3 @@ For more information about contributing to Armada see [CONTRIBUTING.md](https://
 ## Discussion
 
 If you are interested in discussing Armada you can find us on  [![slack](https://img.shields.io/badge/slack-armada-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/?redir=%2Farchives%2FC03T9CBCEMC)
-
-
diff --git a/build/lookout/Dockerfile b/build/lookout/Dockerfile
diff --git a/build/lookoutingester/Dockerfile b/build/lookoutingester/Dockerfile
diff --git a/build_goreleaser/bundles/full/Dockerfile b/build_goreleaser/bundles/full/Dockerfile
@@ -7,7 +7,6 @@ LABEL org.opencontainers.image.title=armada-full-bundle
 LABEL org.opencontainers.image.description="Armada Full Bundle"
 LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada-full-bundle
 COPY internal/lookout/ui /project/internal/lookout/ui
-COPY pkg/api/lookout/*.swagger.json /project/pkg/api/lookout/
 COPY pkg/api/*.swagger.json /project/pkg/api/
 COPY pkg/api/binoculars/*.swagger.json /project/pkg/api/binoculars/
 RUN ./project/internal/lookout/ui/openapi.sh
@@ -23,7 +22,7 @@ RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 COPY --from=NODE /ui/build/ /app/internal/lookout/ui/build
 
-COPY server executor binoculars lookout lookoutingester eventingester lookoutingesterv2 lookoutv2 jobservice scheduler scheduleringester armadactl /app/
+COPY server executor binoculars eventingester lookoutingesterv2 lookoutv2 jobservice scheduler scheduleringester armadactl /app/
 COPY config/ /app/config/
 
 WORKDIR /app
diff --git a/build_goreleaser/bundles/lookout/Dockerfile b/build_goreleaser/bundles/lookout/Dockerfile
@@ -8,18 +8,10 @@ LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada-
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
-# Lookout
-COPY config/lookout/ /app/config/lookout
-
-# Lookout ingester
-COPY config/lookoutingester/config.yaml /app/config/lookoutingester/config.yaml
-
-# LookoutV2 ingester
 COPY config/lookoutingesterv2/config.yaml /app/config/lookoutingesterv2/config.yaml
 
-# Lookoutv2
 COPY config/lookoutv2/config.yaml /app/config/lookoutv2/config.yaml
 
-COPY lookout lookoutingester lookoutingesterv2 lookoutv2 /app/
+COPY lookoutingesterv2 lookoutv2 /app/
 
 WORKDIR /app
diff --git a/build_goreleaser/lookout/Dockerfile b/build_goreleaser/lookout/Dockerfile
diff --git a/build_goreleaser/lookoutingester/Dockerfile b/build_goreleaser/lookoutingester/Dockerfile
diff --git a/client/DotNet/Armada.Client/ClientGenerated.cs b/client/DotNet/Armada.Client/ClientGenerated.cs
@@ -113,6 +113,75 @@ public async System.Threading.Tasks.Task<ApiBatchQueueCreateResponse> CreateQueu
             }
         }
 
+        /// <returns>A successful response.(streaming responses)</returns>
+        /// <exception cref="ApiException">A server side error occurred.</exception>
+        public System.Threading.Tasks.Task<Response> GetQueuesAsync(long? num)
+        {
+            return GetQueuesAsync(num, System.Threading.CancellationToken.None);
+        }
+
+        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
+        /// <returns>A successful response.(streaming responses)</returns>
+        /// <exception cref="ApiException">A server side error occurred.</exception>
+        public async System.Threading.Tasks.Task<Response> GetQueuesAsync(long? num, System.Threading.CancellationToken cancellationToken)
+        {
+            var urlBuilder_ = new System.Text.StringBuilder();
+            urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/batched/queues?");
+            if (num != null) 
+            {
+                urlBuilder_.Append(System.Uri.EscapeDataString("num") + "=").Append(System.Uri.EscapeDataString(ConvertToString(num, System.Globalization.CultureInfo.InvariantCulture))).Append("&");
+            }
+            urlBuilder_.Length--;
+
+            var client_ = _httpClient;
+            try
+            {
+                using (var request_ = new System.Net.Http.HttpRequestMessage())
+                {
+                    request_.Method = new System.Net.Http.HttpMethod("GET");
+                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
+
+                    PrepareRequest(client_, request_, urlBuilder_);
+                    var url_ = urlBuilder_.ToString();
+                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
+                    PrepareRequest(client_, request_, url_);
+
+                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+                    try
+                    {
+                        var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
+                        if (response_.Content != null && response_.Content.Headers != null)
+                        {
+                            foreach (var item_ in response_.Content.Headers)
+                                headers_[item_.Key] = item_.Value;
+                        }
+
+                        ProcessResponse(client_, response_);
+
+                        var status_ = ((int)response_.StatusCode).ToString();
+                        if (status_ == "200") 
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<Response>(response_, headers_).ConfigureAwait(false);
+                            return objectResponse_.Object;
+                        }
+                        else
+                        {
+                            var objectResponse_ = await ReadObjectResponseAsync<RuntimeError>(response_, headers_).ConfigureAwait(false);
+                            throw new ApiException<RuntimeError>("An unexpected error response.", (int)response_.StatusCode, objectResponse_.Text, headers_, objectResponse_.Object, null);
+                        }
+                    }
+                    finally
+                    {
+                        if (response_ != null)
+                            response_.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+            }
+        }
+
         /// <returns>A successful response.</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
         public System.Threading.Tasks.Task<ApiBatchQueueUpdateResponse> UpdateQueuesAsync(ApiQueueList body)
@@ -1048,6 +1117,12 @@ public partial class ApiContainerStatus
         public string Reason { get; set; }
 
 
+    }
+
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.27.0 (Newtonsoft.Json v12.0.0.0)")]
+    public partial class ApiEndMarker 
+    {
+
     }
 
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.27.0 (Newtonsoft.Json v12.0.0.0)")]
@@ -2168,6 +2243,18 @@ public enum ApiServiceType
 
     }
 
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.27.0 (Newtonsoft.Json v12.0.0.0)")]
+    public partial class ApiStreamingQueueMessage 
+    {
+        [Newtonsoft.Json.JsonProperty("end", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public ApiEndMarker End { get; set; }
+
+        [Newtonsoft.Json.JsonProperty("queue", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public ApiQueue Queue { get; set; }
+
+
+    }
+
     /// <summary>+protobuf=true
     /// +protobuf.options.(gogoproto.goproto_stringer)=false
     /// +k8s:openapi-gen=true</summary>
@@ -6110,6 +6197,18 @@ public partial class V1WindowsSecurityContextOptions
         public string RunAsUserName { get; set; }
 
 
+    }
+
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.0.27.0 (Newtonsoft.Json v12.0.0.0)")]
+    public partial class Response 
+    {
+        [Newtonsoft.Json.JsonProperty("error", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public RuntimeStreamError Error { get; set; }
+
+        [Newtonsoft.Json.JsonProperty("result", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public ApiStreamingQueueMessage Result { get; set; }
+
+
     }
 
     public partial class FileResponse : System.IDisposable
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,5 +64,3 @@ For more information about contributing to Armada see [CONTRIBUTING.md](https://
		## Discussion

		If you are interested in discussing Armada you can find us on [![slack](https://img.shields.io/badge/slack-armada-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/?redir=%2Farchives%2FC03T9CBCEMC)