diff --git a/.gitignore b/.gitignore index 9fe993af..dc24eb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Logs -logs +/logs *.log npm-debug.log* yarn-debug.log* diff --git a/azure/specs/service-spec.json.tpl b/azure/specs/service-spec.json.tpl index 830a0bf3..90ca683e 100644 --- a/azure/specs/service-spec.json.tpl +++ b/azure/specs/service-spec.json.tpl @@ -13,6 +13,7 @@ "fixed_instances", "scheduled_stop", "additional_ports", + "protocol", "continuous_delivery" ], "uiSchema":{ @@ -101,10 +102,6 @@ "type":"Control", "scope":"#/properties/autoscaling/properties/target_cpu_utilization" }, - { - "type": "Control", - "scope": "#/properties/autoscaling/properties/target_memory_enabled" - }, { "rule": { "effect": "SHOW", @@ -170,6 +167,19 @@ } ] }, + { + "type": "Category", + "label": "Protocol", + "elements": [ + { + "type": "Control", + "scope": "#/properties/protocol", + "options": { + "format": "radio" + } + } + ] + }, { "type":"Category", "label":"Continuous deployment", @@ -333,7 +343,7 @@ } ], "title":"RAM Memory", - "default":64, + "default":128, "description":"Amount of RAM memory to allocate to the container (in MB)" }, "visibility":{ @@ -382,17 +392,17 @@ "description":"CPU utilization threshold that triggers scaling" }, "target_memory_enabled": { - "type": "boolean", - "title": "Scale by memory", - "default": false + "type": "boolean", + "title": "Scale by memory", + "default": false }, "target_memory_utilization": { - "type": "integer", - "title": "Target memory utilization (%)", - "default": 70, - "maximum": 90, - "minimum": 30, - "description": "Memory utilization threshold that triggers scaling" + "type": "integer", + "title": "Target memory utilization (%)", + "default": 70, + "maximum": 90, + "minimum": 50, + "description": "Memory utilization threshold that triggers scaling" } } }, @@ -539,6 +549,7 @@ ], "type":"string", "title":"Port Type", + "default": "GRPC", "description":"The protocol type for this port" } } @@ -576,6 +587,36 @@ } }, "description":"Configure automatic deployment from Git branches" + }, + "custom_domains": { + "type": "object", + "required": [ + "enabled" + ], + "properties": { + "enabled": { + "type": "boolean", + "default": true + } + } + }, + "protocol": { + "type": "string", + "oneOf": [ + { + "const": "http", + "title": "HTTP connections", + "description": "Enable http web server" + }, + { + "const": "web_sockets", + "title": "Web sockets", + "description": "Enable web sockets connections" + } + ], + "title": "Protocol", + "default": "http", + "description": "Define the inbound traffic the application will accept" } } } diff --git a/k8s/apply_templates b/k8s/apply_templates index 54a7cb20..08310939 100644 --- a/k8s/apply_templates +++ b/k8s/apply_templates @@ -9,7 +9,13 @@ while IFS= read -r TEMPLATE_FILE; do echo "kubectl $ACTION $TEMPLATE_FILE" if [[ "$DRY_RUN" == "false" ]]; then - kubectl "$ACTION" -f "$TEMPLATE_FILE" + IGNORE_NOT_FOUND="" + + if [[ "$ACTION" == "delete" ]]; then + IGNORE_NOT_FOUND="--ignore-not-found=true" + fi + + kubectl "$ACTION" -f "$TEMPLATE_FILE" $IGNORE_NOT_FOUND fi BASE_DIR="$(dirname "$TEMPLATE_FILE")" diff --git a/k8s/deployment/build_context b/k8s/deployment/build_context index 96b3b0bb..cb539de8 100755 --- a/k8s/deployment/build_context +++ b/k8s/deployment/build_context @@ -36,7 +36,19 @@ fi IMAGE_PULL_SECRETS="${IMAGE_PULL_SECRETS:-"{}"}" IMAGE_PULL_SECRETS=$(echo "$IMAGE_PULL_SECRETS" | jq .) -TRAFFIC_CONTAINER_IMAGE=${TRAFFIC_CONTAINER_IMAGE:-"public.ecr.aws/nullplatform/k8s-traffic-manager:latest"} +SCOPE_TRAFFIC_PROTOCOL=$(echo "$CONTEXT" | jq -r .scope.capabilities.protocol) + +TRAFFIC_CONTAINER_VERSION="latest" + +if [[ "$SCOPE_TRAFFIC_PROTOCOL" == "web_sockets" ]]; then + TRAFFIC_CONTAINER_VERSION="websocket2" +fi + +TRAFFIC_CONTAINER_IMAGE=${TRAFFIC_CONTAINER_IMAGE:-"public.ecr.aws/nullplatform/k8s-traffic-manager:$TRAFFIC_CONTAINER_VERSION"} + +# Pod Disruption Budget configuration +PDB_ENABLED=${POD_DISRUPTION_BUDGET_ENABLED:-"false"} +PDB_MAX_UNAVAILABLE=${POD_DISRUPTION_BUDGET_MAX_UNAVAILABLE:-"25%"} CONTEXT=$(echo "$CONTEXT" | jq \ --arg blue_deployment_id "$BLUE_DEPLOYMENT_ID" \ @@ -45,12 +57,16 @@ CONTEXT=$(echo "$CONTEXT" | jq \ --arg total_replicas "$REPLICAS" \ --arg traffic_image "$TRAFFIC_CONTAINER_IMAGE" \ --argjson pull_secrets "$IMAGE_PULL_SECRETS" \ + --arg pdb_enabled "$PDB_ENABLED" \ + --arg pdb_max_unavailable "$PDB_MAX_UNAVAILABLE" \ '. + {blue_deployment_id: $blue_deployment_id, blue_replicas: $blue_replicas, green_replicas: $green_replicas, total_replicas: $total_replicas, pull_secrets: $pull_secrets, - traffic_image: $traffic_image + traffic_image: $traffic_image, + pdb_enabled: $pdb_enabled, + pdb_max_unavailable: $pdb_max_unavailable }') DEPLOYMENT_ID=$(echo "$CONTEXT" | jq -r '.deployment.id') diff --git a/k8s/deployment/build_deployment b/k8s/deployment/build_deployment index bcd167da..2312ec34 100755 --- a/k8s/deployment/build_deployment +++ b/k8s/deployment/build_deployment @@ -42,6 +42,7 @@ DEPLOYMENT_PATH="$OUTPUT_DIR/deployment-$SCOPE_ID-$DEPLOYMENT_ID.yaml" SECRET_PATH="$OUTPUT_DIR/secret-$SCOPE_ID-$DEPLOYMENT_ID.yaml" SCALING_PATH="$OUTPUT_DIR/scaling-$SCOPE_ID-$DEPLOYMENT_ID.yaml" SERVICE_TEMPLATE_PATH="$OUTPUT_DIR/service-$SCOPE_ID-$DEPLOYMENT_ID.yaml" +PDB_PATH="$OUTPUT_DIR/pdb-$SCOPE_ID-$DEPLOYMENT_ID.yaml" CONTEXT_PATH="$OUTPUT_DIR/context-$SCOPE_ID.json" echo "$CONTEXT" | jq --arg replicas "$REPLICAS" --arg service_account_name "$SERVICE_ACCOUNT_NAME" '. + {replicas: $replicas, service_account_name: $service_account_name}' > "$CONTEXT_PATH" @@ -94,7 +95,20 @@ gomplate -c .="$CONTEXT_PATH" \ TEMPLATE_GENERATION_STATUS=$? if [[ $TEMPLATE_GENERATION_STATUS -ne 0 ]]; then - echo "Error building scaling template" + echo "Error building service template" + exit 1 +fi + +echo "Building Template: $PDB_TEMPLATE to $PDB_PATH" + +gomplate -c .="$CONTEXT_PATH" \ + --file "$PDB_TEMPLATE" \ + --out "$PDB_PATH" + +TEMPLATE_GENERATION_STATUS=$? + +if [[ $TEMPLATE_GENERATION_STATUS -ne 0 ]]; then + echo "Error building PDB template" exit 1 fi diff --git a/k8s/deployment/delete_cluster_objects b/k8s/deployment/delete_cluster_objects new file mode 100644 index 00000000..288c639e --- /dev/null +++ b/k8s/deployment/delete_cluster_objects @@ -0,0 +1,10 @@ +#!/bin/bash + +DEPLOYMENT_TO_CLEAN="$DEPLOYMENT_ID" + +if [ "$DEPLOYMENT" = "blue" ]; then + DEPLOYMENT_TO_CLEAN=$(echo "$CONTEXT" | jq .scope.current_active_deployment -r) +fi + +kubectl delete deployment,service,hpa,ingress,pdb,secret,configmap \ + -l deployment_id="$DEPLOYMENT_TO_CLEAN" -n "$K8S_NAMESPACE" --cascade=foreground --wait=true diff --git a/k8s/deployment/templates/deployment.yaml.tpl b/k8s/deployment/templates/deployment.yaml.tpl index 172e3a30..d16fdf0d 100644 --- a/k8s/deployment/templates/deployment.yaml.tpl +++ b/k8s/deployment/templates/deployment.yaml.tpl @@ -30,6 +30,15 @@ metadata: labels: name: d-{{ .scope.id }}-{{ .deployment.id }} app.kubernetes.io/part-of: {{ .namespace.slug }} + account: {{ .account.slug }} + account_id: "{{ .account.id }}" + namespace: {{ .namespace.slug }} + namespace_id: "{{ .namespace.id }}" + application: {{ .application.slug }} + application_id: "{{ .application.id }}" + scope: {{ .scope.slug }} + scope_id: "{{ .scope.id }}" + deployment_id: "{{ .deployment.id }}" spec: replicas: {{ .replicas }} selector: @@ -39,7 +48,7 @@ spec: metadata: labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} nullplatform: "true" account: "{{ .account.slug }}" account_id: "{{ .account.id }}" diff --git a/k8s/deployment/templates/dns-endpoint.yaml.tpl b/k8s/deployment/templates/dns-endpoint.yaml.tpl new file mode 100644 index 00000000..e68e1903 --- /dev/null +++ b/k8s/deployment/templates/dns-endpoint.yaml.tpl @@ -0,0 +1,22 @@ +apiVersion: externaldns.k8s.io/v1alpha1 +kind: DNSEndpoint +metadata: + name: k-8-s-{{ .scope.slug }}-{{ .scope.id }}-dns + namespace: {{ .k8s_namespace }} + labels: + nullplatform: "true" + account: {{ .account.slug }} + account_id: "{{ .account.id }}" + namespace: {{ .namespace.slug }} + namespace_id: "{{ .namespace.id }}" + application: {{ .application.slug }} + application_id: "{{ .application.id }}" + scope: {{ .scope.slug }} + scope_id: "{{ .scope.id }}" +spec: + endpoints: + - dnsName: {{ .scope.domain }} + recordTTL: 60 + recordType: A + targets: + - "{{ .gateway_ip }}" diff --git a/k8s/deployment/templates/istio/service.yaml.tpl b/k8s/deployment/templates/istio/service.yaml.tpl index 08a188e6..051579e4 100644 --- a/k8s/deployment/templates/istio/service.yaml.tpl +++ b/k8s/deployment/templates/istio/service.yaml.tpl @@ -5,7 +5,7 @@ metadata: namespace: {{ .k8s_namespace }} labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} app.kubernetes.io/component: application app.kubernetes.io/instance: {{ .scope.slug }} app.kubernetes.io/name: {{ .scope.slug }} diff --git a/k8s/deployment/templates/pdb.yaml.tpl b/k8s/deployment/templates/pdb.yaml.tpl new file mode 100644 index 00000000..dc5c4a49 --- /dev/null +++ b/k8s/deployment/templates/pdb.yaml.tpl @@ -0,0 +1,53 @@ +{{if eq .pdb_enabled "true"}} +apiVersion: policy/v1 +kind: PodDisruptionBudget +metadata: + name: pdb-d-{{ .scope.id }}-{{ .deployment.id }} + namespace: {{ .k8s_namespace }} + labels: + name: pdb-d-{{ .scope.id }}-{{ .deployment.id }} + app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/component: application + app.kubernetes.io/instance: {{ .scope.slug }} + app.kubernetes.io/name: {{ .scope.slug }} +{{- $global := index .k8s_modifiers "global" }} +{{- if $global }} + {{- $labels := index $global "labels" }} + {{- if $labels }} +{{ data.ToYAML $labels | indent 4 }} + {{- end }} +{{- end }} +{{- $pdb := index .k8s_modifiers "pdb" }} +{{- if $pdb }} + {{- $labels := index $pdb "labels" }} + {{- if $labels }} +{{ data.ToYAML $labels | indent 4 }} + {{- end }} +{{- end }} + annotations: + nullplatform.com/managed-by: nullplatform + nullplatform.com/account: {{ .account.slug }} + nullplatform.com/namespace: {{ .namespace.slug }} + nullplatform.com/application: {{ .application.slug }} + nullplatform.com/scope: {{ .scope.slug }} + nullplatform.com/deployment-id: "{{ .deployment.id }}" +{{- $global := index .k8s_modifiers "global" }} +{{- if $global }} + {{- $annotations := index $global "annotations" }} + {{- if $annotations }} +{{ data.ToYAML $annotations | indent 4 }} + {{- end }} +{{- end }} +{{- $pdb := index .k8s_modifiers "pdb" }} +{{- if $pdb }} + {{- $annotations := index $pdb "annotations" }} + {{- if $annotations }} +{{ data.ToYAML $annotations | indent 4 }} + {{- end }} +{{- end }} +spec: + maxUnavailable: {{ .pdb_max_unavailable }} + selector: + matchLabels: + app: d-{{ .scope.id }}-{{ .deployment.id }} +{{- end }} \ No newline at end of file diff --git a/k8s/deployment/templates/scaling.yaml.tpl b/k8s/deployment/templates/scaling.yaml.tpl index 10187b80..700953cd 100644 --- a/k8s/deployment/templates/scaling.yaml.tpl +++ b/k8s/deployment/templates/scaling.yaml.tpl @@ -4,6 +4,18 @@ kind: HorizontalPodAutoscaler metadata: name: hpa-d-{{ .scope.id }}-{{ .deployment.id }} namespace: {{ .k8s_namespace }} + labels: + name: d-{{ .scope.id }}-{{ .deployment.id }} + app.kubernetes.io/part-of: {{ .namespace.slug }} + account: {{ .account.slug }} + account_id: "{{ .account.id }}" + namespace: {{ .namespace.slug }} + namespace_id: "{{ .namespace.id }}" + application: {{ .application.slug }} + application_id: "{{ .application.id }}" + scope: {{ .scope.slug }} + scope_id: "{{ .scope.id }}" + deployment_id: "{{ .deployment.id }}" spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/k8s/deployment/templates/service.yaml.tpl b/k8s/deployment/templates/service.yaml.tpl index 30a788cc..7d369d43 100644 --- a/k8s/deployment/templates/service.yaml.tpl +++ b/k8s/deployment/templates/service.yaml.tpl @@ -5,10 +5,19 @@ metadata: namespace: {{ .k8s_namespace }} labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} app.kubernetes.io/component: application app.kubernetes.io/instance: {{ .scope.slug }} app.kubernetes.io/name: {{ .scope.slug }} + account: {{ .account.slug }} + account_id: "{{ .account.id }}" + namespace: {{ .namespace.slug }} + namespace_id: "{{ .namespace.id }}" + application: {{ .application.slug }} + application_id: "{{ .application.id }}" + scope: {{ .scope.slug }} + scope_id: "{{ .scope.id }}" + deployment_id: "{{ .deployment.id }}" {{- $global := index .k8s_modifiers "global" }} {{- if $global }} {{- $labels := index $global "labels" }} @@ -83,6 +92,15 @@ metadata: app.kubernetes.io/component: application app.kubernetes.io/instance: {{ $.scope.slug }} app.kubernetes.io/name: {{ $.scope.slug }} + account: {{ $.account.slug }} + account_id: "{{ $.account.id }}" + namespace: {{ $.namespace.slug }} + namespace_id: "{{ $.namespace.id }}" + application: {{ $.application.slug }} + application_id: "{{ $.application.id }}" + scope: {{ $.scope.slug }} + scope_id: "{{ $.scope.id }}" + deployment_id: "{{ $.deployment.id }}" {{- $global := index .k8s_modifiers "global" }} {{- if $global }} {{- $labels := index $global "labels" }} @@ -155,6 +173,15 @@ metadata: app.kubernetes.io/component: application app.kubernetes.io/instance: {{ $.scope.slug }} app.kubernetes.io/name: {{ $.scope.slug }} + account: {{ $.account.slug }} + account_id: "{{ $.account.id }}" + namespace: {{ $.namespace.slug }} + namespace_id: "{{ $.namespace.id }}" + application: {{ $.application.slug }} + application_id: "{{ $.application.id }}" + scope: {{ $.scope.slug }} + scope_id: "{{ $.scope.id }}" + deployment_id: "{{ $.deployment.id }}" annotations: service.beta.openshift.io/serving-cert-secret-name: d-{{ $.scope.id }}-grpc-{{ .port }} alb.ingress.kubernetes.io/healthcheck-interval-seconds: '10' diff --git a/k8s/deployment/workflows/delete.yaml b/k8s/deployment/workflows/delete.yaml index 81729e80..2e28b167 100644 --- a/k8s/deployment/workflows/delete.yaml +++ b/k8s/deployment/workflows/delete.yaml @@ -50,4 +50,10 @@ steps: file: "$SERVICE_PATH/apply_templates" configuration: ACTION: delete - DRY_RUN: false \ No newline at end of file + DRY_RUN: false + post: + name: delete_cluster_objects + type: script + file: "$SERVICE_PATH/deployment/delete_cluster_objects" + configuration: + DEPLOYMENT: green \ No newline at end of file diff --git a/k8s/deployment/workflows/finalize.yaml b/k8s/deployment/workflows/finalize.yaml index af4b0cd0..28b17e63 100644 --- a/k8s/deployment/workflows/finalize.yaml +++ b/k8s/deployment/workflows/finalize.yaml @@ -66,3 +66,9 @@ steps: configuration: ACTION: delete DRY_RUN: false + post: + name: delete_cluster_objects + type: script + file: "$SERVICE_PATH/deployment/delete_cluster_objects" + configuration: + DEPLOYMENT: blue diff --git a/k8s/deployment/workflows/initial.yaml b/k8s/deployment/workflows/initial.yaml index fc225f4d..63ac9d15 100644 --- a/k8s/deployment/workflows/initial.yaml +++ b/k8s/deployment/workflows/initial.yaml @@ -61,4 +61,5 @@ steps: type: script file: "$SERVICE_PATH/deployment/wait_deployment_active" configuration: - TIMEOUT: DEPLOYMENT_MAX_WAIT_IN_SECONDS \ No newline at end of file + TIMEOUT: DEPLOYMENT_MAX_WAIT_IN_SECONDS + diff --git a/k8s/deployment/workflows/rollback.yaml b/k8s/deployment/workflows/rollback.yaml index eaa749c9..28a88b9b 100644 --- a/k8s/deployment/workflows/rollback.yaml +++ b/k8s/deployment/workflows/rollback.yaml @@ -66,3 +66,9 @@ steps: configuration: ACTION: delete DRY_RUN: false + post: + name: delete_cluster_objects + type: script + file: "$SERVICE_PATH/deployment/delete_cluster_objects" + configuration: + DEPLOYMENT: green diff --git a/k8s/log/build_context b/k8s/log/build_context index ad23952b..a1a7697e 100755 --- a/k8s/log/build_context +++ b/k8s/log/build_context @@ -5,6 +5,9 @@ export NEXT_PAGE_TOKEN=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.argume export START_TIME=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.start_time // empty') export APPLICATION_ID=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.application_id // empty') export DEPLOYMENT_ID=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.deployment_id // .notification.arguments.deploy_id // empty') +export FILTER_PATTERN=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.filter_pattern // empty') +export INSTANCE_ID=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.instance_id // empty') +export LIMIT=$(echo "$NP_ACTION_CONTEXT" | jq -r '.notification.arguments.limit // empty') if [ -z "$APPLICATION_ID" ]; then echo "Error: Missing required parameters: APPLICATION_ID" >&2 diff --git a/k8s/log/kube-logger-go/Makefile b/k8s/log/kube-logger-go/Makefile new file mode 100644 index 00000000..28225c71 --- /dev/null +++ b/k8s/log/kube-logger-go/Makefile @@ -0,0 +1,11 @@ +PLATFORMS := linux darwin +BUILD_DIR := bin + +build: + go mod tidy && $(foreach platform,$(PLATFORMS), \ + rm -fr $(BUILD_DIR)/$(platform);\ + mkdir -p $(BUILD_DIR)/$(platform); \ + GOARCH=amd64 GOOS=$(platform) go build -ldflags "-s -w" -tags full -o $(BUILD_DIR)/$(platform)/exec-amd64 ./cmd; \ + GOARCH=arm64 GOOS=$(platform) go build -ldflags "-s -w" -tags full -o $(BUILD_DIR)/$(platform)/exec-arm64 ./cmd; \ + GOARCH=amd64 GOOS=$(platform) go build -ldflags "-s -w" -tags full -o $(BUILD_DIR)/$(platform)/exec-x86_64 ./cmd; \ +) diff --git a/k8s/log/kube-logger-go/README.md b/k8s/log/kube-logger-go/README.md new file mode 100644 index 00000000..3827b24a --- /dev/null +++ b/k8s/log/kube-logger-go/README.md @@ -0,0 +1,18 @@ +

+ + nullplatform + +
+ Logs Extraction for Kubernetes +
+

+ + +## How do I built it? + +After any code changes, you need to rebuild the binary. + +1. Run the makefile to build the binary: + ```bash + make build + ``` \ No newline at end of file diff --git a/k8s/log/kube-logger-go/bin/linux/exec-x86_64 b/k8s/log/kube-logger-go/bin/linux/exec-x86_64 new file mode 100755 index 00000000..84924e66 Binary files /dev/null and b/k8s/log/kube-logger-go/bin/linux/exec-x86_64 differ diff --git a/k8s/log/kube-logger-go/cmd/main.go b/k8s/log/kube-logger-go/cmd/main.go new file mode 100644 index 00000000..6fea1ec6 --- /dev/null +++ b/k8s/log/kube-logger-go/cmd/main.go @@ -0,0 +1,97 @@ +package main + +import ( + "encoding/json" + "fmt" + "os" + "sort" + + corev1 "k8s.io/api/core/v1" + + "kube-logger-go/internal/config" + "kube-logger-go/internal/kubernetes" + "kube-logger-go/internal/logs" + "kube-logger-go/internal/pagination" + "kube-logger-go/internal/types" +) + +func main() { + cfg := config.ParseFlags() + + // Validate required parameters + if cfg.Namespace == "" { + fmt.Fprintf(os.Stderr, "Error: namespace is required\n") + os.Exit(1) + } + + // Create Kubernetes client + clientset, err := kubernetes.NewClient() + if err != nil { + fmt.Fprintf(os.Stderr, "Failed to create Kubernetes client: %v\n", err) + os.Exit(1) + } + + // Get all pods or a specific pod + var pods []corev1.Pod + if cfg.InstanceID != "" { + pod, err := kubernetes.GetPod(clientset, cfg.Namespace, cfg.InstanceID) + if err != nil { + fmt.Fprintf(os.Stderr, "Failed to get pod: %v\n", err) + os.Exit(1) + } + if pod != nil { + pods = []corev1.Pod{*pod} + } else { + pods = []corev1.Pod{} + } + } else { + var err error + pods, err = kubernetes.GetPods(clientset, cfg) + if err != nil { + fmt.Fprintf(os.Stderr, "Failed to get pods: %v\n", err) + os.Exit(1) + } + } + + if len(pods) == 0 { + outputEmptyResponse() + return + } + + // Get logs concurrently from all pods + fetcher := logs.NewFetcher(clientset) + allLogs := fetcher.FetchConcurrently(pods, cfg) + + // Sort logs by datetime + sort.Slice(allLogs, func(i, j int) bool { + return allLogs[i].DateTime < allLogs[j].DateTime + }) + + // Limit results + if len(allLogs) > cfg.Limit { + allLogs = allLogs[:cfg.Limit] + } + if len(allLogs) == 0 { + allLogs = []types.LogEntry{} + } + + // Generate next page token + token := pagination.GenerateToken(allLogs) + + response := types.Response{ + Results: allLogs, + NextPageToken: token, + } + + output, _ := json.Marshal(response) + fmt.Println(string(output)) +} + +func outputEmptyResponse() { + response := types.Response{ + Results: []types.LogEntry{}, + NextPageToken: "", + } + output, _ := json.Marshal(response) + fmt.Println(string(output)) +} \ No newline at end of file diff --git a/k8s/log/kube-logger-go/go.mod b/k8s/log/kube-logger-go/go.mod new file mode 100644 index 00000000..b2ebfeaa --- /dev/null +++ b/k8s/log/kube-logger-go/go.mod @@ -0,0 +1,49 @@ +module kube-logger-go + +go 1.21 + +require ( + k8s.io/api v0.27.2 + k8s.io/apimachinery v0.27.2 + k8s.io/client-go v0.27.2 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.1 // indirect + github.com/go-openapi/swag v0.22.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/imdario/mergo v0.3.6 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/klog/v2 v2.90.1 // indirect + k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect + k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect +) diff --git a/k8s/log/kube-logger-go/go.sum b/k8s/log/kube-logger-go/go.sum new file mode 100644 index 00000000..085c7d6c --- /dev/null +++ b/k8s/log/kube-logger-go/go.sum @@ -0,0 +1,491 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= +github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= +github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= +k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= +k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= +k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= +k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ= +k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= +k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/k8s/log/kube-logger-go/internal/config/config.go b/k8s/log/kube-logger-go/internal/config/config.go new file mode 100644 index 00000000..747731d3 --- /dev/null +++ b/k8s/log/kube-logger-go/internal/config/config.go @@ -0,0 +1,36 @@ +package config + +import ( + "flag" + + "kube-logger-go/internal/types" +) + +// ParseFlags parses command line flags and returns a Config +func ParseFlags() types.Config { + config := types.Config{Limit: types.DefaultLimit} + + // Long flags + flag.StringVar(&config.Namespace, "namespace", "", "Kubernetes namespace") + flag.StringVar(&config.ApplicationID, "application-id", "", "Application ID") + flag.StringVar(&config.ScopeID, "scope-id", "", "Scope ID") + flag.StringVar(&config.DeploymentID, "deployment-id", "", "Deployment ID") + flag.IntVar(&config.Limit, "limit", types.DefaultLimit, "Maximum log entries") + flag.StringVar(&config.NextPageToken, "next-page-token", "", "Pagination token") + flag.StringVar(&config.FilterPattern, "filter", "", "Filter pattern") + flag.StringVar(&config.StartTime, "start-time", "", "Start time (ISO format)") + flag.StringVar(&config.InstanceID, "instance-id", "", "Instance ID") + + // Short flags + flag.StringVar(&config.Namespace, "n", "", "Kubernetes namespace") + flag.StringVar(&config.ApplicationID, "a", "", "Application ID") + flag.StringVar(&config.ScopeID, "s", "", "Scope ID") + flag.StringVar(&config.DeploymentID, "d", "", "Deployment ID") + flag.IntVar(&config.Limit, "l", types.DefaultLimit, "Maximum log entries") + flag.StringVar(&config.NextPageToken, "t", "", "Pagination token") + flag.StringVar(&config.FilterPattern, "f", "", "Filter pattern") + flag.StringVar(&config.InstanceID, "i", "", "Instance ID") + + flag.Parse() + return config +} \ No newline at end of file diff --git a/k8s/log/kube-logger-go/internal/kubernetes/client.go b/k8s/log/kube-logger-go/internal/kubernetes/client.go new file mode 100644 index 00000000..da16178b --- /dev/null +++ b/k8s/log/kube-logger-go/internal/kubernetes/client.go @@ -0,0 +1,71 @@ +package kubernetes + +import ( + "context" + "fmt" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" + + "kube-logger-go/internal/types" +) + +// NewClient creates and returns a Kubernetes clientset +func NewClient() (*kubernetes.Clientset, error) { + var config *rest.Config + var err error + + // Try in-cluster config first + if config, err = rest.InClusterConfig(); err != nil { + // Fall back to kubeconfig + kubeconfig := clientcmd.NewDefaultClientConfigLoadingRules().GetDefaultFilename() + config, err = clientcmd.BuildConfigFromFlags("", kubeconfig) + if err != nil { + return nil, err + } + } + + return kubernetes.NewForConfig(config) +} + +// buildLabelSelector builds a label selector string based on the config +func buildLabelSelector(config types.Config) string { + selector := "nullplatform=true" + if config.ApplicationID != "" { + selector += ",application_id=" + config.ApplicationID + } + if config.ScopeID != "" { + selector += ",scope_id=" + config.ScopeID + } + if config.DeploymentID != "" { + selector += ",deployment_id=" + config.DeploymentID + } + return selector +} + +// GetPods retrieves pods based on the configuration +func GetPods(clientset *kubernetes.Clientset, config types.Config) ([]corev1.Pod, error) { + ctx := context.Background() + selector := buildLabelSelector(config) + + podList, err := clientset.CoreV1().Pods(config.Namespace).List(ctx, metav1.ListOptions{ + LabelSelector: selector, + }) + if err != nil { + return nil, fmt.Errorf("failed to list pods: %v", err) + } + + return podList.Items, nil +} + +func GetPod(clientset *kubernetes.Clientset, namespace, podName string) (*corev1.Pod, error) { + ctx := context.Background() + pod, err := clientset.CoreV1().Pods(namespace).Get(ctx, podName, metav1.GetOptions{}) + if err != nil { + return nil, fmt.Errorf("failed to get pod %s in namespace %s: %v", podName, namespace, err) + } + return pod, nil +} diff --git a/k8s/log/kube-logger-go/internal/logs/fetcher.go b/k8s/log/kube-logger-go/internal/logs/fetcher.go new file mode 100644 index 00000000..576aaffa --- /dev/null +++ b/k8s/log/kube-logger-go/internal/logs/fetcher.go @@ -0,0 +1,157 @@ +package logs + +import ( + "bufio" + "context" + "strings" + "sync" + "time" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" + + "kube-logger-go/internal/pagination" + "kube-logger-go/internal/types" +) + +// Fetcher handles log fetching operations +type Fetcher struct { + clientset *kubernetes.Clientset +} + +// NewFetcher creates a new log fetcher instance +func NewFetcher(clientset *kubernetes.Clientset) *Fetcher { + return &Fetcher{ + clientset: clientset, + } +} + +// FetchConcurrently fetches logs from multiple pods concurrently +func (f *Fetcher) FetchConcurrently(pods []corev1.Pod, config types.Config) []types.LogEntry { + if len(pods) == 0 { + return []types.LogEntry{} + } + + // Calculate logs per pod + podLimit := config.Limit / len(pods) + if podLimit < types.MinLogsPerPod { + podLimit = types.MinLogsPerPod + } + + // Decode pagination token + lastReadTimes := pagination.DecodeToken(config.NextPageToken) + + allLogs := make([]types.LogEntry, 0, config.Limit) + var mu sync.Mutex + var wg sync.WaitGroup + + // Fetch logs from each pod concurrently + for _, pod := range pods { + wg.Add(1) + go func(p corev1.Pod) { + defer wg.Done() + + podUID := string(p.UID) + + // Determine since time for this pod + sinceTime := determineSinceTime(podUID, lastReadTimes, config.StartTime) + + // Get pod logs + logCh := make(chan string, 100) + go func() { + defer close(logCh) + f.streamPodLogs(&p, config.Namespace, sinceTime, int64(podLimit*3072), logCh) + }() + + processor := NewProcessor() + processedLogs := processor.ProcessLinesFromChannel(logCh, config.FilterPattern, p.Name, podUID, getLastReadTime(podUID, lastReadTimes)) + + if len(processedLogs) > 0 { + mu.Lock() + allLogs = append(allLogs, processedLogs...) + mu.Unlock() + } + }(pod) + } + + wg.Wait() + return allLogs +} + +// getPodLogs retrieves logs from a specific pod +func (f *Fetcher) getPodLogs(pod *corev1.Pod, namespace, sinceTime string, limitBytes int64) string { + ctx := context.Background() + + opts := &corev1.PodLogOptions{ + Container: types.DefaultContainerName, + Timestamps: true, + LimitBytes: &limitBytes, + } + + // Add since time if provided + if sinceTime != "" { + if sinceTimeObj, err := time.Parse(time.RFC3339, sinceTime); err == nil { + metaTime := metav1.NewTime(sinceTimeObj) + opts.SinceTime = &metaTime + } + } + + req := f.clientset.CoreV1().Pods(namespace).GetLogs(pod.Name, opts) + podLogs, err := req.Stream(ctx) + if err != nil { + return "" + } + defer podLogs.Close() + + var logContent strings.Builder + scanner := bufio.NewScanner(podLogs) + for scanner.Scan() { + logContent.WriteString(scanner.Text()) + logContent.WriteString("\n") + } + + return logContent.String() +} + +func (f *Fetcher) streamPodLogs(pod *corev1.Pod, namespace, sinceTime string, limitBytes int64, logCh chan<- string) { + ctx := context.Background() + opts := &corev1.PodLogOptions{ + Container: types.DefaultContainerName, + Timestamps: true, + LimitBytes: &limitBytes, + } + if sinceTime != "" { + if sinceTimeObj, err := time.Parse(time.RFC3339, sinceTime); err == nil { + metaTime := metav1.NewTime(sinceTimeObj) + opts.SinceTime = &metaTime + } + } + req := f.clientset.CoreV1().Pods(namespace).GetLogs(pod.Name, opts) + podLogs, err := req.Stream(ctx) + if err != nil { + return + } + defer podLogs.Close() + + scanner := bufio.NewScanner(podLogs) + for scanner.Scan() { + logCh <- scanner.Text() + } +} + +// determineSinceTime determines the appropriate since time for a pod +func determineSinceTime(podUID string, lastReadTimes map[string]string, startTime string) string { + if lastTime, exists := lastReadTimes[podUID]; exists && lastTime != "" && lastTime != "null" { + return lastTime + } + return startTime +} + +// getLastReadTime retrieves the last read time for a specific pod +func getLastReadTime(podUID string, lastReadTimes map[string]string) string { + if lastTime, exists := lastReadTimes[podUID]; exists { + return lastTime + } + return "" +} \ No newline at end of file diff --git a/k8s/log/kube-logger-go/internal/logs/processor.go b/k8s/log/kube-logger-go/internal/logs/processor.go new file mode 100644 index 00000000..73ebdb8d --- /dev/null +++ b/k8s/log/kube-logger-go/internal/logs/processor.go @@ -0,0 +1,153 @@ +package logs + +import ( + "bufio" + "strings" + "time" + + "kube-logger-go/internal/types" +) + +// Processor handles log processing operations +type Processor struct{} + +// NewProcessor creates a new log processor instance +func NewProcessor() *Processor { + return &Processor{} +} + +// ProcessLinesFromChannel processes log lines received from a channel and returns structured log entries +func (p *Processor) ProcessLinesFromChannel(logCh <-chan string, filterPattern, podName, podUID, lastReadTime string) []types.LogEntry { + var entries []types.LogEntry + + var terms []string + if filterPattern != "" { + terms = strings.Fields(filterPattern) + } + + for line := range logCh { + if line == "" { + continue + } + + parts := strings.SplitN(line, " ", 2) + if len(parts) < 2 { + continue + } + + timestamp := parts[0] + message := parts[1] + + if !p.isValidTimestamp(timestamp) { + continue + } + + if lastReadTime != "" && lastReadTime != "null" && lastReadTime != "empty" { + if timestamp <= lastReadTime { + continue + } + } + + if len(terms) > 0 { + matches := true + for _, term := range terms { + if !strings.Contains(line, term) { + matches = false + break + } + } + if !matches { + continue + } + } + + entry := types.LogEntry{ + Message: message, + DateTime: timestamp, + Pod: types.PodInfo{ + Name: podName, + ID: podUID, + }, + } + entries = append(entries, entry) + } + + return entries +} + +// ProcessLines processes raw log content and returns structured log entries +func (p *Processor) ProcessLines(logs, filterPattern, podName, podUID, lastReadTime string) []types.LogEntry { + if logs == "" { + return []types.LogEntry{} + } + + var entries []types.LogEntry + scanner := bufio.NewScanner(strings.NewReader(logs)) + + for scanner.Scan() { + line := scanner.Text() + if line == "" { + continue + } + + // Extract timestamp and message + parts := strings.SplitN(line, " ", 2) + if len(parts) < 2 { + continue + } + + timestamp := parts[0] + message := parts[1] + + // Validate timestamp format - skip lines with invalid timestamps + if !p.isValidTimestamp(timestamp) { + continue + } + + // Duplicate detection logic (matching bash script behavior) + if lastReadTime != "" && lastReadTime != "null" && lastReadTime != "empty" { + // If timestamp is same or older than last read time, skip it + if timestamp <= lastReadTime { + continue + } + } + + // Apply filter if specified (all terms in filterPattern must be present) + if filterPattern != "" { + terms := strings.Fields(filterPattern) + matches := true + for _, term := range terms { + if !strings.Contains(line, term) { + matches = false + break + } + } + if !matches { + continue + } + } + + entry := types.LogEntry{ + Message: message, + DateTime: timestamp, + Pod: types.PodInfo{ + Name: podName, + ID: podUID, + }, + } + + entries = append(entries, entry) + } + + return entries +} + +// isValidTimestamp checks if a timestamp string is in a valid format +func (p *Processor) isValidTimestamp(timestamp string) bool { + // Check RFC3339 format (e.g., 2025-09-04T15:24:34.944759409Z) + _, err := time.Parse(time.RFC3339Nano, timestamp) + if err != nil { + _, err = time.Parse(time.RFC3339, timestamp) + } + return err == nil +} \ No newline at end of file diff --git a/k8s/log/kube-logger-go/internal/pagination/token.go b/k8s/log/kube-logger-go/internal/pagination/token.go new file mode 100644 index 00000000..a5d99b34 --- /dev/null +++ b/k8s/log/kube-logger-go/internal/pagination/token.go @@ -0,0 +1,55 @@ +package pagination + +import ( + "encoding/base64" + "encoding/json" + + "kube-logger-go/internal/types" +) + +// DecodeToken decodes a base64 pagination token into a map +func DecodeToken(token string) map[string]string { + if token == "" { + return make(map[string]string) + } + + decoded, err := base64.StdEncoding.DecodeString(token) + if err != nil { + return make(map[string]string) + } + + var result map[string]string + if err := json.Unmarshal(decoded, &result); err != nil { + return make(map[string]string) + } + + return result +} + +// encodeToken encodes a map into a base64 pagination token +func encodeToken(data map[string]string) string { + if len(data) == 0 { + return "" + } + + jsonData, err := json.Marshal(data) + if err != nil { + return "" + } + + return base64.StdEncoding.EncodeToString(jsonData) +} + +// GenerateToken creates a pagination token from log entries +func GenerateToken(logs []types.LogEntry) string { + if len(logs) == 0 { + return "" + } + + tokenData := make(map[string]string) + for _, entry := range logs { + tokenData[entry.Pod.ID] = entry.DateTime + } + + return encodeToken(tokenData) +} \ No newline at end of file diff --git a/k8s/log/kube-logger-go/internal/types/types.go b/k8s/log/kube-logger-go/internal/types/types.go new file mode 100644 index 00000000..1aede49e --- /dev/null +++ b/k8s/log/kube-logger-go/internal/types/types.go @@ -0,0 +1,39 @@ +package types + +const ( + DefaultContainerName = "application" + DefaultLimit = 100 + MinLogsPerPod = 10 +) + +// LogEntry represents a single log entry +type LogEntry struct { + Message string `json:"message"` + DateTime string `json:"datetime"` + Pod PodInfo `json:"pod"` +} + +// PodInfo contains pod identification information +type PodInfo struct { + Name string `json:"name"` + ID string `json:"id"` +} + +// Response is the final output structure +type Response struct { + Results []LogEntry `json:"results"` + NextPageToken string `json:"next_page_token"` +} + +// Config holds all command line configuration +type Config struct { + Namespace string + ApplicationID string + ScopeID string + DeploymentID string + Limit int + NextPageToken string + FilterPattern string + StartTime string + InstanceID string +} \ No newline at end of file diff --git a/k8s/log/log b/k8s/log/log index d5110233..2652f0af 100644 --- a/k8s/log/log +++ b/k8s/log/log @@ -1,6 +1,9 @@ #!/bin/bash -KUBE_LOGGER_SCRIPT="$SERVICE_PATH/log/kube-logger-bash/exec" +PLATFORM=$(uname | tr '[:upper:]' '[:lower:]') +ARCH=$(uname -m) + +KUBE_LOGGER_SCRIPT="$SERVICE_PATH/log/kube-logger-go/bin/$PLATFORM/exec-$ARCH" if [ ! -f "$KUBE_LOGGER_SCRIPT" ]; then echo "Error: kube-logger bash script not found at $KUBE_LOGGER_SCRIPT" >&2 @@ -21,6 +24,21 @@ if [ -n "$NEXT_PAGE_TOKEN" ]; then CMD="$CMD --next-page-token $NEXT_PAGE_TOKEN" fi +# Add optional filter pattern +if [ -n "$FILTER_PATTERN" ]; then + CMD="$CMD --filter \"$FILTER_PATTERN\"" +fi + +# Add optional instance ID +if [ -n "$INSTANCE_ID" ]; then + CMD="$CMD --instance-id $INSTANCE_ID" +fi + +# Add optional limit +if [ -n "$LIMIT" ]; then + CMD="$CMD --limit $LIMIT" +fi + # Add optional start time (convert from milliseconds to ISO format) if [ -n "$START_TIME" ]; then SECONDS=$(echo "$START_TIME/1000" | bc) diff --git a/k8s/scope/build_context b/k8s/scope/build_context index 2b769169..d1e44fd3 100755 --- a/k8s/scope/build_context +++ b/k8s/scope/build_context @@ -4,10 +4,6 @@ K8S_NAMESPACE=$(echo "$CONTEXT" | jq -r --arg default "$K8S_NAMESPACE" ' .providers["container-orchestration"].cluster.namespace // $default ') -DOMAIN=$(echo "$CONTEXT" | jq -r --arg default "$DOMAIN" ' - .providers["cloud-providers"].networking.domain_name // $default -') - USE_ACCOUNT_SLUG=$(echo "$CONTEXT" | jq -r --arg default "$USE_ACCOUNT_SLUG" ' .providers["cloud-providers"].networking.application_domain // $default ') @@ -15,6 +11,16 @@ USE_ACCOUNT_SLUG=$(echo "$CONTEXT" | jq -r --arg default "$USE_ACCOUNT_SLUG" ' REGION=$(echo "$CONTEXT" | jq -r '.providers["cloud-providers"].account.region // "us-east-1"') SCOPE_VISIBILITY=$(echo "$CONTEXT" | jq -r '.scope.capabilities.visibility') + +if [ "$SCOPE_VISIBILITY" = "public" ]; then + DOMAIN=$(echo "$CONTEXT" | jq -r --arg default "$DOMAIN" ' + .providers["cloud-providers"].networking.domain_name // $default + ') +else + DOMAIN=$(echo "$CONTEXT" | jq -r --arg private_default "$PRIVATE_DOMAIN" --arg default "$DOMAIN" ' + .providers["cloud-providers"].networking.private_domain_name // $private_default // .providers["cloud-providers"].networking.domain_name // $default + ') +fi SCOPE_DOMAIN=$(echo "$CONTEXT" | jq .scope.domain -r) eval "$(echo "$CONTEXT" | jq -r '.scope.nrn | " @@ -31,10 +37,12 @@ export SCOPE_DOMAIN if [ "$SCOPE_VISIBILITY" = "public" ]; then export INGRESS_VISIBILITY="internet-facing" - export GATEWAY_NAME="${PUBLIC_GATEWAY_NAME:-gateway-public}" + GATEWAY_DEFAULT="${PUBLIC_GATEWAY_NAME:-gateway-public}" + export GATEWAY_NAME=$(echo "$CONTEXT" | jq -r --arg default "$GATEWAY_DEFAULT" '.providers["container-orchestration"].gateway.public_name // $default') else export INGRESS_VISIBILITY="internal" - export GATEWAY_NAME="${PRIVATE_GATEWAY_NAME:-gateway-internal}" + GATEWAY_DEFAULT="${PRIVATE_GATEWAY_NAME:-gateway-internal}" + export GATEWAY_NAME=$(echo "$CONTEXT" | jq -r --arg default "$GATEWAY_DEFAULT" '.providers["container-orchestration"].gateway.private_name // $default') fi K8S_MODIFIERS="${K8S_MODIFIERS:-"{}"}" @@ -48,14 +56,19 @@ else ALB_NAME=$(echo "$CONTEXT" | jq -r --arg default "$ALB_NAME" '.providers["container-orchestration"].balancer.private_name // $default') fi +NAMESPACE_SLUG=$(echo "$CONTEXT" | jq -r .namespace.slug) +APPLICATION_SLUG=$(echo "$CONTEXT" | jq -r .application.slug) +COMPONENT=$(echo "$NAMESPACE_SLUG-$APPLICATION_SLUG" | cut -c1-63) + CONTEXT=$(echo "$CONTEXT" | jq \ --arg ingress_visibility "$INGRESS_VISIBILITY" \ --arg k8s_namespace "$K8S_NAMESPACE" \ --arg region "$REGION" \ --arg gateway_name "$GATEWAY_NAME" \ --arg alb_name "$ALB_NAME" \ + --arg component "$COMPONENT" \ --argjson modifiers "$K8S_MODIFIERS" \ - '. + {ingress_visibility: $ingress_visibility, k8s_namespace: $k8s_namespace, gateway_name: $gateway_name, region: $region, k8s_modifiers: $modifiers, alb_name: $alb_name}') + '. + {ingress_visibility: $ingress_visibility, k8s_namespace: $k8s_namespace, gateway_name: $gateway_name, region: $region, k8s_modifiers: $modifiers, alb_name: $alb_name, component: $component}') export OUTPUT_DIR="$SERVICE_PATH/output/$SCOPE_ID" export CONTEXT diff --git a/k8s/scope/networking/dns/build_dns_context b/k8s/scope/networking/dns/build_dns_context index 5b81a71b..9df57eb5 100755 --- a/k8s/scope/networking/dns/build_dns_context +++ b/k8s/scope/networking/dns/build_dns_context @@ -18,6 +18,10 @@ case "$DNS_TYPE" in echo "PUBLIC_GATEWAY_NAME: $PUBLIC_GATEWAY_NAME" echo "PRIVATE_GATEWAY_NAME: $PRIVATE_GATEWAY_NAME" ;; + external_dns) + echo "external_dns context ready" + echo "DNS records will be managed automatically by External DNS operator" + ;; *) echo "Error: Unsupported DNS type '$DNS_TYPE'" exit 1 diff --git a/k8s/scope/networking/dns/external_dns/manage_route b/k8s/scope/networking/dns/external_dns/manage_route new file mode 100644 index 00000000..7c8cfdf4 --- /dev/null +++ b/k8s/scope/networking/dns/external_dns/manage_route @@ -0,0 +1,59 @@ +#!/bin/bash + +set -euo pipefail + +if [ "$ACTION" = "CREATE" ]; then + echo "Building DNSEndpoint manifest for ExternalDNS..." + + echo "Getting IP for gateway: $GATEWAY_NAME" + + GATEWAY_IP=$(kubectl get gateway "$GATEWAY_NAME" -n gateways \ + -o jsonpath='{.status.addresses[?(@.type=="IPAddress")].value}' 2>/dev/null) + + if [ -z "$GATEWAY_IP" ]; then + echo "Warning: Could not get gateway IP for $GATEWAY_NAME" + + GATEWAY_IP=$(kubectl get service "$GATEWAY_NAME" -n gateways \ + -o jsonpath='{.status.loadBalancer.ingress[0].ip}' 2>/dev/null) + fi + + if [ -z "$GATEWAY_IP" ]; then + echo "Warning: Could not determine gateway IP address yet, DNSEndpoint will be created later" + exit 0 + fi + + echo "Gateway IP: $GATEWAY_IP" + + DNS_ENDPOINT_TEMPLATE="${DNS_ENDPOINT_TEMPLATE:-$SERVICE_PATH/deployment/templates/dns-endpoint.yaml.tpl}" + + if [ -f "$DNS_ENDPOINT_TEMPLATE" ]; then + DNS_ENDPOINT_FILE="$OUTPUT_DIR/dns-endpoint-$SCOPE_ID.yaml" + CONTEXT_PATH="$OUTPUT_DIR/context-$SCOPE_ID-dns.json" + + echo "$CONTEXT" | jq --arg gateway_ip "$GATEWAY_IP" '. + {gateway_ip: $gateway_ip}' > "$CONTEXT_PATH" + + echo "Building DNSEndpoint Template: $DNS_ENDPOINT_TEMPLATE to $DNS_ENDPOINT_FILE" + + gomplate -c .="$CONTEXT_PATH" \ + --file "$DNS_ENDPOINT_TEMPLATE" \ + --out "$DNS_ENDPOINT_FILE" + + echo "DNSEndpoint manifest created at: $DNS_ENDPOINT_FILE" + + rm "$CONTEXT_PATH" + + else + echo "Error: DNSEndpoint template not found at $DNS_ENDPOINT_TEMPLATE" + exit 1 + fi + +elif [ "$ACTION" = "DELETE" ]; then + echo "Deleting DNSEndpoint for external_dns..." + + SCOPE_SLUG=$(echo "$CONTEXT" | jq -r '.scope.slug') + DNS_ENDPOINT_NAME="k-8-s-${SCOPE_SLUG}-${SCOPE_ID}-dns" + echo "Attempting to delete DNSEndpoint by name: $DNS_ENDPOINT_NAME" + kubectl delete dnsendpoint "$DNS_ENDPOINT_NAME" -n "$K8S_NAMESPACE" || echo "DNSEndpoint may already be deleted" + + echo "DNSEndpoint deletion completed" +fi \ No newline at end of file diff --git a/k8s/scope/networking/dns/manage_dns b/k8s/scope/networking/dns/manage_dns index eed162f9..f5fd1202 100755 --- a/k8s/scope/networking/dns/manage_dns +++ b/k8s/scope/networking/dns/manage_dns @@ -35,6 +35,13 @@ case "$DNS_TYPE" in --hosted-zone-name="$HOSTED_ZONE_NAME" \ --hosted-zone-rg="$HOSTED_ZONE_RG" ;; + external_dns) + echo "Using external_dns provider" + source "$SERVICE_PATH/scope/networking/dns/external_dns/manage_route" || { + echo "ERROR: External DNS management failed" + exit 1 + } + ;; *) echo "Error: Unsupported dns type '$DNS_TYPE'" exit 1 diff --git a/k8s/scope/networking/dns/route53/manage_route b/k8s/scope/networking/dns/route53/manage_route index 5a415b65..5b6d5238 100644 --- a/k8s/scope/networking/dns/route53/manage_route +++ b/k8s/scope/networking/dns/route53/manage_route @@ -33,20 +33,16 @@ fi echo "Found load balancer DNS: $ELB_DNS_NAME" -if [ "$SCOPE_VISIBILITY" = "public" ]; then - HOSTED_ZONES=("$HOSTED_PUBLIC_ZONE_ID") -else - HOSTED_ZONES=() - - if [[ -n "$HOSTED_PRIVATE_ZONE_ID" ]] && [[ "$HOSTED_PRIVATE_ZONE_ID" != "null" ]]; then - HOSTED_ZONES+=("$HOSTED_PRIVATE_ZONE_ID") - fi - - if [[ -n "$HOSTED_PUBLIC_ZONE_ID" ]] && [[ "$HOSTED_PUBLIC_ZONE_ID" != "null" ]]; then - if [[ "$HOSTED_PUBLIC_ZONE_ID" != "$HOSTED_PRIVATE_ZONE_ID" ]]; then - HOSTED_ZONES+=("$HOSTED_PUBLIC_ZONE_ID") - echo "Will create records in both public and private zones" - fi +HOSTED_ZONES=() + +if [[ -n "$HOSTED_PRIVATE_ZONE_ID" ]] && [[ "$HOSTED_PRIVATE_ZONE_ID" != "null" ]]; then + HOSTED_ZONES+=("$HOSTED_PRIVATE_ZONE_ID") +fi + +if [[ -n "$HOSTED_PUBLIC_ZONE_ID" ]] && [[ "$HOSTED_PUBLIC_ZONE_ID" != "null" ]]; then + if [[ "$HOSTED_PUBLIC_ZONE_ID" != "$HOSTED_PRIVATE_ZONE_ID" ]]; then + HOSTED_ZONES+=("$HOSTED_PUBLIC_ZONE_ID") + echo "Will create records in both public and private zones" fi fi @@ -88,4 +84,4 @@ for ZONE_ID in "${HOSTED_ZONES[@]}"; do } echo "Successfully $ACTION Route53 record" -done +done \ No newline at end of file diff --git a/k8s/scope/networking/gateway/build_gateway b/k8s/scope/networking/gateway/build_gateway index b1e4e38a..8d97e2da 100755 --- a/k8s/scope/networking/gateway/build_gateway +++ b/k8s/scope/networking/gateway/build_gateway @@ -15,4 +15,5 @@ gomplate -c .="$CONTEXT_PATH" \ --file "$TEMPLATE" \ --out "$INGRESS_FILE" + rm "$CONTEXT_PATH" \ No newline at end of file diff --git a/k8s/scope/wait_on_balancer b/k8s/scope/wait_on_balancer new file mode 100644 index 00000000..9f9edf88 --- /dev/null +++ b/k8s/scope/wait_on_balancer @@ -0,0 +1,59 @@ +#!/bin/bash + +echo "Waiting for balancer/DNS setup to complete..." + +MAX_ITERATIONS=${MAX_ITERATIONS:-30} +iteration=0 + +case "$DNS_TYPE" in + external_dns) + SCOPE_DOMAIN=$(echo "$CONTEXT" | jq -r '.scope.domain') + SCOPE_SLUG=$(echo "$CONTEXT" | jq -r '.scope.slug') + SCOPE_ID=$(echo "$CONTEXT" | jq -r '.scope.id') + + echo "Checking ExternalDNS record creation for domain: $SCOPE_DOMAIN" + + while true; do + iteration=$((iteration + 1)) + if [ $iteration -gt $MAX_ITERATIONS ]; then + echo "⚠️ DNS record creation timeout after $((MAX_ITERATIONS * 10))s" + echo "ExternalDNS may still be processing the DNSEndpoint resource" + echo "You can check manually with: kubectl get dnsendpoint -A" + exit 1 + fi + + echo "Checking DNS resolution for $SCOPE_DOMAIN (attempt $iteration/$MAX_ITERATIONS)" + + DNS_ENDPOINT_NAME="k-8-s-${SCOPE_SLUG}-${SCOPE_ID}-dns" + echo "Checking DNSEndpoint status: $DNS_ENDPOINT_NAME" + + DNS_STATUS=$(kubectl get dnsendpoint "$DNS_ENDPOINT_NAME" -n "$K8S_NAMESPACE" -o jsonpath='{.status}' 2>/dev/null || echo "not found") + + if [ "$DNS_STATUS" != "not found" ] && [ -n "$DNS_STATUS" ]; then + echo "DNSEndpoint status: $DNS_STATUS" + fi + + if nslookup "$SCOPE_DOMAIN" 8.8.8.8 >/dev/null 2>&1; then + echo "✓ DNS record for $SCOPE_DOMAIN is now resolvable" + + RESOLVED_IP=$(nslookup "$SCOPE_DOMAIN" 8.8.8.8 | grep -A1 "Name:" | tail -1 | awk '{print $2}' 2>/dev/null || echo "unknown") + echo "✓ Domain $SCOPE_DOMAIN resolves to: $RESOLVED_IP" + + break + fi + + echo "DNS record not yet available, waiting 10s..." + sleep 10 + done + + echo "✓ ExternalDNS setup completed successfully" + ;; + route53|azure) + echo "DNS Type $DNS_TYPE - DNS should already be configured" + echo "Skipping DNS wait check" + ;; + *) + echo "Unknown DNS type: $DNS_TYPE" + echo "Skipping DNS wait check" + ;; +esac \ No newline at end of file diff --git a/k8s/scope/workflows/create.yaml b/k8s/scope/workflows/create.yaml index c57caa2a..adb336c5 100644 --- a/k8s/scope/workflows/create.yaml +++ b/k8s/scope/workflows/create.yaml @@ -57,3 +57,16 @@ steps: type: environment - name: HOSTED_PRIVATE_ZONE_ID type: environment + post: + name: apply_and_wait + type: workflow + steps: + - name: apply dns templates + type: script + file: "$SERVICE_PATH/apply_templates" + configuration: + ACTION: apply + DRY_RUN: false + - name: wait on balancer + type: script + file: "$SERVICE_PATH/scope/wait_on_balancer" diff --git a/k8s/specs/service-spec.json.tpl b/k8s/specs/service-spec.json.tpl index 3a6d4efc..90ca683e 100644 --- a/k8s/specs/service-spec.json.tpl +++ b/k8s/specs/service-spec.json.tpl @@ -13,6 +13,7 @@ "fixed_instances", "scheduled_stop", "additional_ports", + "protocol", "continuous_delivery" ], "uiSchema":{ @@ -166,6 +167,19 @@ } ] }, + { + "type": "Category", + "label": "Protocol", + "elements": [ + { + "type": "Control", + "scope": "#/properties/protocol", + "options": { + "format": "radio" + } + } + ] + }, { "type":"Category", "label":"Continuous deployment", @@ -329,7 +343,7 @@ } ], "title":"RAM Memory", - "default":64, + "default":128, "description":"Amount of RAM memory to allocate to the container (in MB)" }, "visibility":{ @@ -535,6 +549,7 @@ ], "type":"string", "title":"Port Type", + "default": "GRPC", "description":"The protocol type for this port" } } @@ -584,6 +599,24 @@ "default": true } } + }, + "protocol": { + "type": "string", + "oneOf": [ + { + "const": "http", + "title": "HTTP connections", + "description": "Enable http web server" + }, + { + "const": "web_sockets", + "title": "Web sockets", + "description": "Enable web sockets connections" + } + ], + "title": "Protocol", + "default": "http", + "description": "Define the inbound traffic the application will accept" } } } diff --git a/k8s/values.yaml b/k8s/values.yaml index 8acb9f34..03b1e45a 100644 --- a/k8s/values.yaml +++ b/k8s/values.yaml @@ -4,13 +4,15 @@ provider_categories: configuration: K8S_NAMESPACE: nullplatform DOMAIN: nullapps.io +# PRIVATE_DOMAIN: nullapps.io USE_ACCOUNT_SLUG: false - DNS_TYPE: route53 + DNS_TYPE: route53 # Available values route53 | azure | external_dns DEPLOYMENT_MAX_WAIT_IN_SECONDS: 600 DEPLOYMENT_TEMPLATE: "$SERVICE_PATH/deployment/templates/deployment.yaml.tpl" SECRET_TEMPLATE: "$SERVICE_PATH/deployment/templates/secret.yaml.tpl" SCALING_TEMPLATE: "$SERVICE_PATH/deployment/templates/scaling.yaml.tpl" SERVICE_TEMPLATE: "$SERVICE_PATH/deployment/templates/service.yaml.tpl" + PDB_TEMPLATE: "$SERVICE_PATH/deployment/templates/pdb.yaml.tpl" INITIAL_INGRESS_PATH: "$SERVICE_PATH/deployment/templates/initial-ingress.yaml.tpl" BLUE_GREEN_INGRESS_PATH: "$SERVICE_PATH/deployment/templates/blue-green-ingress.yaml.tpl" SERVICE_ACCOUNT_TEMPLATE: "$SERVICE_PATH/scope/templates/service-account.yaml.tpl" @@ -53,6 +55,9 @@ configuration: # BUCKET: bucket-name # PREFIX: path-prefix # DEPLOY_STRATEGY: rolling +# POD_DISRUPTION_BUDGET: +# ENABLED: false +# MAX_UNAVAILABLE: "25%" # Can be percentage or number (e.g., "2") # K8S_MODIFIERS: # global: # annotations: diff --git a/scheduled_task/deployment/templates/deployment.yaml.tpl b/scheduled_task/deployment/templates/deployment.yaml.tpl index 24c15513..8e52a29c 100644 --- a/scheduled_task/deployment/templates/deployment.yaml.tpl +++ b/scheduled_task/deployment/templates/deployment.yaml.tpl @@ -5,7 +5,7 @@ metadata: namespace: {{ .k8s_namespace }} labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} nullplatform: "true" account: "{{ .account.slug }}" account_id: "{{ .account.id }}" @@ -39,7 +39,7 @@ spec: metadata: labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} nullplatform: "true" account: "{{ .account.slug }}" account_id: "{{ .account.id }}" @@ -70,7 +70,7 @@ spec: metadata: labels: name: d-{{ .scope.id }}-{{ .deployment.id }} - app.kubernetes.io/part-of: {{ .namespace.slug }}-{{ .application.slug }} + app.kubernetes.io/part-of: {{ .component }} nullplatform: "true" account: "{{ .account.slug }}" account_id: "{{ .account.id }}"