From d7ed010b1a86516734435c9adf6d0df31dfbbfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Wed, 12 Apr 2023 13:54:58 -0700 Subject: [PATCH 1/8] crd changes --- deploy/crd.yaml | 1864 +++++++++++++++++++++++------------------------ 1 file changed, 930 insertions(+), 934 deletions(-) diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 75cbf276..e1b3b0dc 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -17,1016 +17,1012 @@ spec: - name: v1beta1 served: true storage: true - - name: v1alpha1 - served: true - storage: false - validation: # openAPIV3Schema is the schema for validating custom objects. - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - image: - type: string - imagePullPolicy: - type: string - enum: [Always, Never, IfNotPresent] - imagePullSecrets: - type: array - items: + openAPIV3Schema: + type: object + properties: + spec: + type: object + properties: + image: + type: string + imagePullPolicy: + type: string + enum: [Always, Never, IfNotPresent] + imagePullSecrets: + type: array + items: + type: object + properties: + name: + type: string + serviceAccountName: + type: string + securityContext: type: object properties: - name: - type: string - serviceAccountName: - type: string - securityContext: - type: object - properties: - fsGroup: - type: integer - minimum: 1 - maximum: 65535 - runAsGroup: - type: integer - minimum: 1 - maximum: 65535 - runAsNonRoot: - type: boolean - runAsUser: - type: integer - minimum: 1 - maximum: 65535 - supplementalGroups: - type: array - items: + fsGroup: type: integer minimum: 1 maximum: 65535 - sysctls: - type: array - items: - type: object - properties: - name: - type: string - value: - type: string - jarName: - type: string - programArgs: - type: string - entryClass: - type: string - flinkVersion: - type: string - restartNonce: - type: string - parallelism: - type: integer - minimum: 1 - deleteMode: - type: string - enum: [Savepoint, None, ForceCancel] - scaleMode: - type: string - enum: [NewCluster, InPlace] - allowNonRestoredState: - type: boolean - deploymentMode: - type: string - enum: [Dual, BlueGreen] - rpcPort: - type: integer - minimum: 1 - maximum: 65535 - blobPort: - type: integer - minimum: 1 - maximum: 65535 - queryPort: - type: integer - minimum: 1 - maximum: 65535 - metricsQueryPort: - type: integer - minimum: 1 - maximum: 65535 - flinkConfig: - type: object - properties: - additionalProperties: - type: string - savepointInfo: - type: object - properties: - savepointLocation: - type: string - savepointPath: - type: string - savepointDisabled: - type: boolean - maxCheckpointRestoreAgeSeconds: - type: integer - minimum: 1 - jobManagerConfig: - type: object - properties: - replicas: - type: integer - minimum: 1 - offHeapMemoryFraction: - type: number - minimum: 0 - maximum: 1 - systemMemoryFraction: - type: number - minimum: 0 - maximum: 1 - nodeSelector: - type: object - properties: - additionalProperties: - type: string - tolerations: - type: array - items: + runAsGroup: + type: integer + minimum: 1 + maximum: 65535 + runAsNonRoot: + type: boolean + runAsUser: + type: integer + minimum: 1 + maximum: 65535 + supplementalGroups: + type: array + items: + type: integer + minimum: 1 + maximum: 65535 + sysctls: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + jarName: + type: string + programArgs: + type: string + entryClass: + type: string + flinkVersion: + type: string + restartNonce: + type: string + parallelism: + type: integer + minimum: 1 + deleteMode: + type: string + enum: [Savepoint, None, ForceCancel] + scaleMode: + type: string + enum: [NewCluster, InPlace] + allowNonRestoredState: + type: boolean + deploymentMode: + type: string + enum: [Dual, BlueGreen] + rpcPort: + type: integer + minimum: 1 + maximum: 65535 + blobPort: + type: integer + minimum: 1 + maximum: 65535 + queryPort: + type: integer + minimum: 1 + maximum: 65535 + metricsQueryPort: + type: integer + minimum: 1 + maximum: 65535 + flinkConfig: + type: object + properties: + additionalProperties: + type: string + savepointInfo: + type: object + properties: + savepointLocation: + type: string + savepointPath: + type: string + savepointDisabled: + type: boolean + maxCheckpointRestoreAgeSeconds: + type: integer + minimum: 1 + jobManagerConfig: + type: object + properties: + replicas: + type: integer + minimum: 1 + offHeapMemoryFraction: + type: number + minimum: 0 + maximum: 1 + systemMemoryFraction: + type: number + minimum: 0 + maximum: 1 + nodeSelector: type: object properties: - effect: - type: string - key: - type: string - operator: + additionalProperties: type: string - tolerationSeconds: - type: integer - format: int64 - value: - type: string - affinity: - properties: - nodeAffinity: + tolerations: + type: array + items: + type: object properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - preference: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + effect: + type: string + key: + type: string + operator: + type: string + tolerationSeconds: + type: integer + format: int64 + value: + type: string + affinity: + properties: + nodeAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + preference: + properties: + matchExpressions: + items: + properties: + key: type: string - type: array - required: - - key - - operator - type: object - type: array - matchFields: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + operator: type: string - type: array - required: - - key - - operator - type: object - type: array - type: object - weight: - format: int32 - type: integer - required: - - preference - - weight - type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - properties: - nodeSelectorTerms: - items: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchFields: + items: + properties: + key: type: string - type: array - required: - - key - - operator - type: object - type: array - matchFields: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + operator: type: string - type: array - required: - - key - - operator - type: object - type: array - type: object - type: array - required: - - nodeSelectorTerms - type: object - type: object - podAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + type: object + weight: + format: int32 + type: integer + required: + - preference + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: properties: - podAffinityTerm: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: + nodeSelectorTerms: + items: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: + type: array + required: + - key + - operator + type: object + type: array + matchFields: + items: + properties: + key: + type: string + operator: + type: string + values: + items: type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string + type: array + required: + - key + - operator type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - weight: - format: int32 - type: integer + type: array + type: object + type: array required: - - podAffinityTerm - - weight + - nodeSelectorTerms type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - labelSelector: - properties: - matchExpressions: - items: + type: object + podAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + podAffinityTerm: + properties: + labelSelector: properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: - type: string - values: + matchExpressions: items: - type: string + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object type: array - required: - - key - - operator + matchLabels: + additionalProperties: + type: string + type: object type: object - type: array - matchLabels: - additionalProperties: + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - type: array - type: object - podAntiAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - podAffinityTerm: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: + required: + - topologyKey + type: object + weight: + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + items: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string + type: array + required: + - key + - operator type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + namespaces: + items: type: string - required: - - topologyKey - type: object - weight: - format: int32 - type: integer - required: - - podAffinityTerm - - weight - type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - labelSelector: - properties: - matchExpressions: - items: + type: array + topologyKey: + type: string + required: + - topologyKey + type: object + type: array + type: object + podAntiAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + podAffinityTerm: + properties: + labelSelector: properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: - type: string - values: + matchExpressions: items: - type: string + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object type: array - required: - - key - - operator + matchLabels: + additionalProperties: + type: string + type: object type: object - type: array - matchLabels: - additionalProperties: + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: object - type: object - namespaces: - items: + required: + - topologyKey + type: object + weight: + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + items: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - type: array - type: object - type: object - envConfig: - type: object - properties: - env: - items: + required: + - topologyKey + type: object + type: array + type: object + type: object + envConfig: + type: object + properties: + env: + items: + properties: + name: + type: string + value: + type: string + valueFrom: + properties: + configMapKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + fieldRef: + properties: + apiVersion: + type: string + fieldPath: + type: string + required: + - fieldPath + type: object + resourceFieldRef: + properties: + containerName: + type: string + divisor: {} + resource: + type: string + required: + - resource + type: object + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + required: + - name + type: object + type: array + envFrom: + items: + properties: + configMapRef: + properties: + name: + type: string + optional: + type: boolean + type: object + prefix: + type: string + secretRef: + properties: + name: + type: string + optional: + type: boolean + type: object + type: object + type: array + resources: + type: object + properties: + requests: + type: object properties: - name: + memory: type: string - value: + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + cpu: type: string - valueFrom: - properties: - configMapKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - required: - - fieldPath - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: {} - resource: - type: string - required: - - resource - type: object - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - required: - - name + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + ephemeral-storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + limits: type: object - type: array - envFrom: - items: properties: - configMapRef: - properties: - name: - type: string - optional: - type: boolean - type: object - prefix: + memory: type: string - secretRef: - properties: - name: - type: string - optional: - type: boolean - type: object - type: object - type: array - resources: - type: object - properties: - requests: - type: object - properties: - memory: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - cpu: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - ephemeral-storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - limits: + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + cpu: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + ephemeral-storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + taskManagerConfig: + type: object + properties: + taskSlots: + type: integer + minimum: 1 + offHeapMemoryFraction: + type: number + minimum: 0 + maximum: 1 + systemMemoryFraction: + type: number + minimum: 0 + maximum: 1 + nodeSelector: + type: object + properties: + additionalProperties: + type: string + tolerations: + type: array + items: type: object properties: - memory: + effect: type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - cpu: + key: type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - storage: + operator: type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - ephemeral-storage: + + tolerationSeconds: + type: integer + format: int64 + value: type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - taskManagerConfig: - type: object - properties: - taskSlots: - type: integer - minimum: 1 - offHeapMemoryFraction: - type: number - minimum: 0 - maximum: 1 - systemMemoryFraction: - type: number - minimum: 0 - maximum: 1 - nodeSelector: - type: object - properties: - additionalProperties: - type: string - tolerations: - type: array - items: - type: object + affinity: properties: - effect: - type: string - key: - type: string - operator: - type: string - - tolerationSeconds: - type: integer - format: int64 - value: - type: string - affinity: - properties: - nodeAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - preference: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + nodeAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + preference: + properties: + matchExpressions: + items: + properties: + key: type: string - type: array - required: - - key - - operator - type: object - type: array - matchFields: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + operator: type: string - type: array - required: - - key - - operator - type: object - type: array - type: object - weight: - format: int32 - type: integer - required: - - preference - - weight - type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - properties: - nodeSelectorTerms: - items: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchFields: + items: + properties: + key: type: string - type: array - required: - - key - - operator - type: object - type: array - matchFields: - items: - properties: - key: - type: string - operator: - type: string - values: - items: + operator: type: string - type: array - required: - - key - - operator - type: object - type: array - type: object - type: array - required: - - nodeSelectorTerms - type: object - type: object - podAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + type: object + weight: + format: int32 + type: integer + required: + - preference + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: properties: - podAffinityTerm: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: + nodeSelectorTerms: + items: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: + type: array + required: + - key + - operator + type: object + type: array + matchFields: + items: + properties: + key: + type: string + operator: + type: string + values: + items: type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string + type: array + required: + - key + - operator type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - weight: - format: int32 - type: integer + type: array + type: object + type: array required: - - podAffinityTerm - - weight + - nodeSelectorTerms type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - labelSelector: - properties: - matchExpressions: - items: + type: object + podAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + podAffinityTerm: + properties: + labelSelector: properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: - type: string - values: + matchExpressions: items: - type: string + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object type: array - required: - - key - - operator + matchLabels: + additionalProperties: + type: string + type: object type: object - type: array - matchLabels: - additionalProperties: + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - type: array - type: object - podAntiAffinity: - properties: - preferredDuringSchedulingIgnoredDuringExecution: - items: - properties: - podAffinityTerm: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: + required: + - topologyKey + type: object + weight: + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + items: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string + type: array + required: + - key + - operator type: object - type: object - namespaces: - items: - type: string - type: array - topologyKey: + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + namespaces: + items: type: string - required: - - topologyKey - type: object - weight: - format: int32 - type: integer - required: - - podAffinityTerm - - weight - type: object - type: array - requiredDuringSchedulingIgnoredDuringExecution: - items: - properties: - labelSelector: - properties: - matchExpressions: - items: + type: array + topologyKey: + type: string + required: + - topologyKey + type: object + type: array + type: object + podAntiAffinity: + properties: + preferredDuringSchedulingIgnoredDuringExecution: + items: + properties: + podAffinityTerm: + properties: + labelSelector: properties: - key: - type: string - x-kubernetes-patch-strategy: merge - x-kubernetes-patch-merge-key: key - operator: - type: string - values: + matchExpressions: items: - type: string + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object type: array - required: - - key - - operator + matchLabels: + additionalProperties: + type: string + type: object type: object - type: array - matchLabels: - additionalProperties: + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: object - type: object - namespaces: - items: + required: + - topologyKey + type: object + weight: + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + items: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + x-kubernetes-patch-strategy: merge + x-kubernetes-patch-merge-key: key + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + namespaces: + items: + type: string + type: array + topologyKey: type: string - type: array - topologyKey: - type: string - required: - - topologyKey - type: object - type: array - type: object - type: object - envConfig: - type: object - properties: - env: - items: + required: + - topologyKey + type: object + type: array + type: object + type: object + envConfig: + type: object + properties: + env: + items: + properties: + name: + type: string + value: + type: string + valueFrom: + properties: + configMapKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + fieldRef: + properties: + apiVersion: + type: string + fieldPath: + type: string + required: + - fieldPath + type: object + resourceFieldRef: + properties: + containerName: + type: string + divisor: {} + resource: + type: string + required: + - resource + type: object + secretKeyRef: + properties: + key: + type: string + name: + type: string + optional: + type: boolean + required: + - key + type: object + type: object + required: + - name + type: object + type: array + envFrom: + items: + properties: + configMapRef: + properties: + name: + type: string + optional: + type: boolean + type: object + prefix: + type: string + secretRef: + properties: + name: + type: string + optional: + type: boolean + type: object + type: object + type: array + resources: + type: object + properties: + requests: + type: object properties: - name: + memory: type: string - value: + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + cpu: type: string - valueFrom: - properties: - configMapKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - fieldRef: - properties: - apiVersion: - type: string - fieldPath: - type: string - required: - - fieldPath - type: object - resourceFieldRef: - properties: - containerName: - type: string - divisor: {} - resource: - type: string - required: - - resource - type: object - secretKeyRef: - properties: - key: - type: string - name: - type: string - optional: - type: boolean - required: - - key - type: object - type: object - required: - - name + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + ephemeral-storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + limits: type: object - type: array - envFrom: - items: properties: - configMapRef: - properties: - name: - type: string - optional: - type: boolean - type: object - prefix: + memory: type: string - secretRef: - properties: - name: - type: string - optional: - type: boolean - type: object - type: object - type: array - resources: + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + cpu: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + ephemeral-storage: + type: string + pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ + volumes: + type: array + items: type: object properties: - requests: - type: object - properties: - memory: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - cpu: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - ephemeral-storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - limits: - type: object - properties: - memory: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - cpu: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - ephemeral-storage: - type: string - pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$ - volumes: - type: array - items: - type: object - properties: - name: - type: string - required: - - name - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - subPath: - type: string - subPathExpr: - type: string - required: - - name - - mountPath - required: - - image - - jarName - - parallelism - - entryClass - subresources: - status: {} - additionalPrinterColumns: - - name: Phase - type: string - description: The current state machine phase for this FlinkApplication - JSONPath: .status.phase - - name: Cluster Health - type: string - description: The health of the Flink cluster - JSONPath: .status.clusterStatus.health - - name: Job Health - type: string - description: The health of the Flink job - JSONPath: .status.jobStatus.health - - name: Healthy TMs - type: string - JSONPath: ".status.clusterStatus.healthyTaskManagers" - priority: 1 - - name: Total TMs - type: string - JSONPath: ".status.clusterStatus.numberOfTaskManagers" - priority: 1 - - name: Job Restarts - type: integer - description: Number of times the job has restarted - JSONPath: .status.jobStatus.jobRestartCount - - name: Age - type: date - JSONPath: .metadata.creationTimestamp + name: + type: string + required: + - name + volumeMounts: + type: array + items: + type: object + properties: + mountPath: + type: string + mountPropagation: + type: string + name: + type: string + readOnly: + type: boolean + subPath: + type: string + subPathExpr: + type: string + required: + - name + - mountPath + required: + - image + - jarName + - parallelism + - entryClass + su bresources: + status: {} + ad ditionalPrinterColumns: + - name: Phase + type: string + description: The current state machine phase for this FlinkApplication + JSONPath: .status.phase + - name: Cluster Health + type: string + description: The health of the Flink cluster + JSONPath: .status.clusterStatus.health + - name: Job Health + type: string + description: The health of the Flink job + JSONPath: .status.jobStatus.health + - name: Healthy TMs + type: string + JSONPath: ".status.clusterStatus.healthyTaskManagers" + priority: 1 + - name: Total TMs + type: string + JSONPath: ".status.clusterStatus.numberOfTaskManagers" + priority: 1 + - name: Job Restarts + type: integer + description: Number of times the job has restarted + JSONPath: .status.jobStatus.jobRestartCount + - name: Age + type: date + JSONPath: .metadata.creationTimestamp From cdd1e5bb29d88c9179889763cc650977fae30973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Wed, 19 Apr 2023 12:00:18 -0700 Subject: [PATCH 2/8] upgrade to v1.22 --- deploy/crd.yaml | 63 +++---- deploy/role-binding.yaml | 2 +- go.mod | 42 +++-- go.sum | 396 +++++++++++++++++++++++++++++++-------- integ/install.sh | 2 +- 5 files changed, 382 insertions(+), 123 deletions(-) diff --git a/deploy/crd.yaml b/deploy/crd.yaml index e1b3b0dc..75eda6da 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: flinkapplications.flink.k8s.io @@ -12,7 +12,6 @@ spec: shortNames: - flinkapp scope: Namespaced - version: v1beta1 versions: - name: v1beta1 served: true @@ -996,33 +995,33 @@ spec: - jarName - parallelism - entryClass - su bresources: - status: {} - ad ditionalPrinterColumns: - - name: Phase - type: string - description: The current state machine phase for this FlinkApplication - JSONPath: .status.phase - - name: Cluster Health - type: string - description: The health of the Flink cluster - JSONPath: .status.clusterStatus.health - - name: Job Health - type: string - description: The health of the Flink job - JSONPath: .status.jobStatus.health - - name: Healthy TMs - type: string - JSONPath: ".status.clusterStatus.healthyTaskManagers" - priority: 1 - - name: Total TMs - type: string - JSONPath: ".status.clusterStatus.numberOfTaskManagers" - priority: 1 - - name: Job Restarts - type: integer - description: Number of times the job has restarted - JSONPath: .status.jobStatus.jobRestartCount - - name: Age - type: date - JSONPath: .metadata.creationTimestamp + subresources: + status: {} + additionalPrinterColumns: + - name: Phase + type: string + description: The current state machine phase for this FlinkApplication + jsonPath: .status.phase + - name: Cluster Health + type: string + description: The health of the Flink cluster + jsonPath: .status.clusterStatus.health + - name: Job Health + type: string + description: The health of the Flink job + jsonPath: .status.jobStatus.health + - name: Healthy TMs + type: string + jsonPath: ".status.clusterStatus.healthyTaskManagers" + priority: 1 + - name: Total TMs + type: string + jsonPath: ".status.clusterStatus.numberOfTaskManagers" + priority: 1 + - name: Job Restarts + type: integer + description: Number of times the job has restarted + jsonPath: .status.jobStatus.jobRestartCount + - name: Age + type: date + jsonPath: .metadata.creationTimestamp diff --git a/deploy/role-binding.yaml b/deploy/role-binding.yaml index e46a1f91..99b48ead 100644 --- a/deploy/role-binding.yaml +++ b/deploy/role-binding.yaml @@ -1,6 +1,6 @@ # Create a binding from Role -> ServiceAccount kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 metadata: name: flinkoperator roleRef: diff --git a/go.mod b/go.mod index b7dd6b8b..e4defc03 100644 --- a/go.mod +++ b/go.mod @@ -9,45 +9,53 @@ require ( github.com/lyft/flytestdlib v0.2.10 github.com/mitchellh/mapstructure v1.4.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/common v0.6.0 + github.com/prometheus/common v0.26.0 github.com/spf13/cobra v1.6.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f gopkg.in/resty.v1 v1.12.0 - k8s.io/api v0.15.13-beta.0 - k8s.io/apiextensions-apiserver v0.15.12 - k8s.io/apimachinery v0.15.13-beta.0 - k8s.io/client-go v0.15.13-beta.0 - k8s.io/code-generator v0.15.12 + k8s.io/api v0.22.17 + k8s.io/apiextensions-apiserver v0.22.17 + k8s.io/apimachinery v0.22.17 + k8s.io/client-go v0.22.17 + k8s.io/code-generator v0.22.17 k8s.io/klog v1.0.0 sigs.k8s.io/controller-runtime v0.3.0 ) require ( + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fatih/color v1.7.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v0.1.0 // indirect + github.com/go-logr/logr v0.4.0 // indirect github.com/go-logr/zapr v0.4.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/google/uuid v1.1.2 // indirect - github.com/googleapis/gnostic v0.3.1 // indirect - github.com/hashicorp/golang-lru v0.5.1 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/imdario/mergo v0.3.7 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kr/text v0.2.0 // indirect github.com/magiconair/properties v1.8.1 // indirect + github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.8 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect @@ -56,16 +64,16 @@ require ( github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pelletier/go-toml v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.1.0 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/afero v1.2.2 // indirect github.com/spf13/cast v1.3.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.3.2 // indirect + github.com/spf13/viper v1.7.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.1.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect @@ -76,16 +84,18 @@ require ( golang.org/x/tools v0.2.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect - gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.51.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 // indirect - k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31 // indirect - k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // indirect + k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect + k8s.io/klog/v2 v2.9.0 // indirect + k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect + k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 01c5611d..8e118bad 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g 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/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= 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= @@ -32,85 +33,138 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX 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/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 h1:VRtJdDi2lqc3MFwmouppm2jlm6icF+7H3WYKpLENMTo= github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= +github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/creack/pty v1.1.11/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/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= 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/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 h1:bRzFpEzvausOAt4va+I/22BZ1vXDtERngp0BNYDKej0= +github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= 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-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= +github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= @@ -119,33 +173,42 @@ github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpR github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= +github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= +github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/validate v0.17.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= 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-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= 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= @@ -158,7 +221,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt 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 v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -172,12 +234,15 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W 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.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= 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= @@ -185,10 +250,10 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ 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.4/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 v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -204,27 +269,54 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/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/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk= github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -237,62 +329,98 @@ github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/jarcoal/httpmock v1.0.4 h1:jp+dy/+nonJE4g4xbVtl9QdrUNbn6/3hDT5R4nDIZnA= github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +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/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= 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/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= 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/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= 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/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/lyft/flytestdlib v0.2.10 h1:RdBRgQlf0+kPFb6y0Ox9SfvcAzH+aa5LJLCULF7AryU= github.com/lyft/flytestdlib v0.2.10/go.mod h1:cN89OAMbgIB4fc71HTLbENOFFqHGc318Reot9B7dPfw= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= +github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= 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 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= 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-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= @@ -302,43 +430,69 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8= -github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -350,51 +504,85 @@ github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +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.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= 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= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= +go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= +go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= +go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= 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= +go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= +go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= +go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= +go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= +go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= +go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= +go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= +go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= +go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 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/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -406,7 +594,6 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0 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 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= 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= @@ -420,6 +607,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl 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/lint v0.0.0-20210508222113-6edffad5e616/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= @@ -428,13 +616,14 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB 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/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= -golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -450,6 +639,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/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= @@ -460,11 +650,15 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ 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-20200520004742-59133d7f0dd7/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-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -485,26 +679,33 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ 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-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/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-20190222072716-a9d3bda3a223/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-20190422165155-953cdadca894/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-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/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-20200106162015-b016eb3dc98e/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= @@ -516,24 +717,41 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w 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-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= 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.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -542,10 +760,13 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb 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-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/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-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -558,10 +779,13 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn 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-20190624222133-a101b041ded4/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-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/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= @@ -581,6 +805,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs 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-20200505023115-26f46d2f7ef8/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= @@ -589,6 +814,7 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc 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.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -598,10 +824,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= 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= @@ -649,14 +873,18 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG 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-20200423170343-7949de9c1215/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-20200513103714-09dca8ec2884/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/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -670,6 +898,10 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa 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/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= 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= @@ -688,6 +920,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= @@ -696,22 +929,35 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/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.0-20210107192922-496545a6307b/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= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= 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= @@ -720,44 +966,44 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt 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.0.0-20190918195907-bd6ac527cfd2/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo= -k8s.io/api v0.15.12/go.mod h1:S1SvCPVhZhYj/dWFUo86dk0Ej/NKuoGuJFhAJiDLYEI= -k8s.io/api v0.15.13-beta.0 h1:LJy6qXUEVNfWCoI5dSeFEsmLYtZDrXfEo2+da7qty30= -k8s.io/api v0.15.13-beta.0/go.mod h1:+1kF7Ndo0iNY7nYyy00GQfUzc0GD47sOCCHfc+VrG+A= +k8s.io/api v0.22.17 h1:FHL0caqndjQYjFV37ZdC4HX0RvCsW2SLKUM6Rpzogpg= +k8s.io/api v0.22.17/go.mod h1:6qVojJ3y+qIq7JSMwTH0BcPHl3dch4HefIC+4nguZhs= k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604/go.mod h1:7H8sjDlWQu89yWB3FhZfsLyRCRLuoXoCoY5qtwW1q6I= -k8s.io/apiextensions-apiserver v0.15.12 h1:akOs6/aOpn2TLqWBDdzu3dvnC25tvhDSAtt7+CVAVL4= -k8s.io/apiextensions-apiserver v0.15.12/go.mod h1:lHDUNSxSQpwf/7gVg8GMWnQ486cu2SNEXpvdnBUBcIk= +k8s.io/apiextensions-apiserver v0.22.17 h1:iNCZvU9DlAum6F6oqf0z//x3sLhZTd4OojGMxLPZTxM= +k8s.io/apiextensions-apiserver v0.22.17/go.mod h1:mLAmK33c0j1UJW03FtFSiJD0SVkDoedSKsoUwJyUfPc= k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw= -k8s.io/apimachinery v0.15.12/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw= -k8s.io/apimachinery v0.15.13-beta.0 h1:BsRKzHBNVG5WslotgJIjADuIUxa7M8elgWfgNRy0zvI= -k8s.io/apimachinery v0.15.13-beta.0/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw= +k8s.io/apimachinery v0.22.17 h1:oXzfuLUA8E2hROqAVVaIF8pp8sBqbIVifbpzfuTL6F0= +k8s.io/apimachinery v0.22.17/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1/go.mod h1:4FuDU+iKPjdsdQSN3GsEKZLB/feQsj1y9dhhBDVV2Ns= -k8s.io/apiserver v0.15.12/go.mod h1:dzcY88tjzTVC1JVtzJrtHnoX+kph3jhJX4mfqrjB/1s= +k8s.io/apiserver v0.22.17/go.mod h1:zNXYCtXZ91AkmIUZgQ8lT9vdlDqgSkokJpds/F6DdGU= k8s.io/client-go v0.0.0-20190918200256-06eb1244587a/go.mod h1:3YAcTbI2ArBRmhHns5vlHRX8YQqvkVYpz+U/N5i1mVU= -k8s.io/client-go v0.15.12/go.mod h1:lODF5jBINl0daZimzPM2IuodA6m81jgHUngyKZ+J5kU= -k8s.io/client-go v0.15.13-beta.0 h1:u4tqyo+zlZwQ/2a4oCmcPS4onpNn/jsxBrAVdYOLL3U= -k8s.io/client-go v0.15.13-beta.0/go.mod h1:9XtkiHBbhymSjORqMaTYBK5RZHB/GIVGJyvHwa0j0dc= +k8s.io/client-go v0.22.17 h1:rtZ7blsPatjMwiAsEcFjo27pHfu+bmAOGBoBCk/kGbA= +k8s.io/client-go v0.22.17/go.mod h1:SQPVpN+E/5Q/aSV7fYDT8VKVdaljhxI/t/84ADVJoC4= k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I= -k8s.io/code-generator v0.15.12 h1:gT9pzUFkbaGsyyI88mD2rbYPTqiJ58vHJkzrQemMFgo= -k8s.io/code-generator v0.15.12/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I= +k8s.io/code-generator v0.22.17 h1:+HS1ZJB3gL5jCVwfuOoj7LccNWffvqXgVGRwquoHqL0= +k8s.io/code-generator v0.22.17/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU= k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778/go.mod h1:DFWQCXgXVLiWtzFaS17KxHdlUeUymP7FLxZSkmL9/jU= -k8s.io/component-base v0.15.12/go.mod h1:x5BynzfY8o8RIPISpgU1U2DDbsXnEUBVNSMCzaMJFXQ= +k8s.io/component-base v0.22.17/go.mod h1:Mrcvmxs+Ctx/xCYGWoFAvfZO9DC4gDgLtUbPJ4PjjUE= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= +k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= +k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31 h1:PsbYeEz2x7ll6JYUzBEG+DT78910DDTlvn5Ma10F5/E= -k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80= +k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= -k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= @@ -766,12 +1012,16 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= 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/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= sigs.k8s.io/controller-runtime v0.3.0 h1:ZtdgqJXVHsIytjdmDuk0QjagnzyLq9FjojXRqIp+dU4= sigs.k8s.io/controller-runtime v0.3.0/go.mod h1:Cw6PkEg0Sa7dAYovGT4R0tRkGhHXpYijwNxYhAnAZZk= sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs= sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/integ/install.sh b/integ/install.sh index 26ef7218..77d324c4 100755 --- a/integ/install.sh +++ b/integ/install.sh @@ -6,6 +6,6 @@ curl -LO -s https://storage.googleapis.com/minikube/releases/latest/minikube-lin sudo install minikube-linux-amd64 /usr/local/bin/minikube minikube config set memory 6800 -minikube start --kubernetes-version=v1.20.15 +minikube start --kubernetes-version=v1.22.17 go mod download From 6ef23a83044ccb7f03964dab2a5d4862b1be64cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 12:01:39 -0700 Subject: [PATCH 3/8] fix incompatible --- go.mod | 71 ++-- go.sum | 352 +++++------------- integ/blue_green_deployment_test.go | 27 +- integ/checkpoint_failure_test.go | 35 +- integ/job_cancellation_test.go | 53 +-- integ/main_test.go | 40 +- integ/scaleup_test.go | 33 +- integ/simple_test.go | 76 ++-- integ/utils/utils.go | 71 ++-- .../typed/app/v1beta1/flinkapplication.go | 33 +- .../versioned/typed/app/v1beta2/app_client.go | 3 +- .../typed/app/v1beta2/flinkapplication.go | 33 +- pkg/controller/flink/client/error_handler.go | 13 +- .../flink/client/error_handler_test.go | 6 +- .../flink/job_manager_controller.go | 2 +- .../flink/mock/mock_error_handler.go | 14 +- .../flinkapplication/flink_state_machine.go | 13 +- .../flink_state_machine_test.go | 12 +- pkg/controller/k8/cluster.go | 2 +- 19 files changed, 372 insertions(+), 517 deletions(-) diff --git a/go.mod b/go.mod index e4defc03..026af3ce 100644 --- a/go.mod +++ b/go.mod @@ -4,68 +4,66 @@ go 1.20 require ( github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 + github.com/go-kit/log v0.2.1 github.com/hashicorp/go-version v1.2.1 github.com/jarcoal/httpmock v1.0.4 github.com/lyft/flytestdlib v0.2.10 - github.com/mitchellh/mapstructure v1.4.1 + github.com/mitchellh/mapstructure v1.4.2 github.com/pkg/errors v0.9.1 - github.com/prometheus/common v0.26.0 github.com/spf13/cobra v1.6.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 - gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/resty.v1 v1.12.0 - k8s.io/api v0.22.17 - k8s.io/apiextensions-apiserver v0.22.17 - k8s.io/apimachinery v0.22.17 - k8s.io/client-go v0.22.17 - k8s.io/code-generator v0.22.17 + k8s.io/api v0.22.2 + k8s.io/apiextensions-apiserver v0.22.2 + k8s.io/apimachinery v0.22.2 + k8s.io/client-go v0.22.2 + k8s.io/code-generator v0.22.2 k8s.io/klog v1.0.0 - sigs.k8s.io/controller-runtime v0.3.0 + sigs.k8s.io/controller-runtime v0.10.1 ) require ( - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect - github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect - github.com/fatih/color v1.7.0 // indirect + github.com/fatih/color v1.12.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v0.4.0 // indirect - github.com/go-logr/zapr v0.4.0 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // 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.1.2 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.7 // indirect + github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/kr/pretty v0.2.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/magiconair/properties v1.8.1 // indirect github.com/mailru/easyjson v0.7.6 // indirect - github.com/mattn/go-colorable v0.0.9 // indirect - github.com/mattn/go-isatty v0.0.8 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pelletier/go-toml v1.7.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/afero v1.2.2 // indirect @@ -73,29 +71,28 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.7.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect - go.uber.org/zap v1.24.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.7.0 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/term v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.2.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect + gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect - gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.51.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect - k8s.io/klog/v2 v2.9.0 // indirect - k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect - k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + k8s.io/component-base v0.22.2 // indirect + k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 8e118bad..645587a5 100644 --- a/go.sum +++ b/go.sum @@ -9,33 +9,21 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T 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/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= 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/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= @@ -43,32 +31,26 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1 h1:VRtJdDi2lqc3MFwmouppm2jlm6icF+7H3WYKpLENMTo= github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1/go.mod h1:jvdWlw8vowVGnZqSDC7yhPd7AifQeQbRDkZcQXV2nRg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -77,14 +59,14 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 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= @@ -94,17 +76,12 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-oidc v0.0.0-20180117170138-065b426bd416/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.0.0-20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -113,32 +90,28 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ 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/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +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/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc= +github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -147,67 +120,48 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= 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-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= +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-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.19.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.17.2/go.mod h1:QO936ZXeisByFmZEO1IS1Dqhtf4QV1sYYFtIq6Ld86Q= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/validate v0.17.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= 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-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= 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= @@ -219,8 +173,6 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb 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= @@ -239,59 +191,45 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +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.4/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 v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= 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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/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/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= -github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= @@ -320,21 +258,19 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.0.4 h1:jp+dy/+nonJE4g4xbVtl9QdrUNbn6/3hDT5R4nDIZnA= github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= -github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= 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/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -355,6 +291,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= 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 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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= @@ -363,20 +301,21 @@ github.com/lyft/flytestdlib v0.2.10 h1:RdBRgQlf0+kPFb6y0Ox9SfvcAzH+aa5LJLCULF7Ar github.com/lyft/flytestdlib v0.2.10/go.mod h1:cN89OAMbgIB4fc71HTLbENOFFqHGc318Reot9B7dPfw= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= -github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -386,8 +325,8 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo= +github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -402,26 +341,25 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= @@ -435,12 +373,12 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -448,14 +386,13 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -463,7 +400,6 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -482,7 +418,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykE github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -491,7 +426,6 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= @@ -499,8 +433,6 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -521,14 +453,10 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -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= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -544,7 +472,6 @@ 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= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= @@ -557,24 +484,21 @@ go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 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= @@ -584,9 +508,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/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-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= 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= @@ -607,6 +529,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl 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/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/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= @@ -622,7 +545,6 @@ golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -636,9 +558,7 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= 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-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/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= @@ -647,37 +567,29 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL 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-20200520004742-59133d7f0dd7/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-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= 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-20190402181905-9f3314589c9a/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/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= +golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= 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/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -689,7 +601,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/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-20190222072716-a9d3bda3a223/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-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -707,68 +618,58 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= 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.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= 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.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/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/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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-20190206041539-40960b6deb8e/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= @@ -800,19 +701,10 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK 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-20200505023115-26f46d2f7ef8/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-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= @@ -820,13 +712,9 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= 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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0= -gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= +gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= 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= @@ -836,22 +724,14 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb 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-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= 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= @@ -869,23 +749,12 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx 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-20200423170343-7949de9c1215/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-20200513103714-09dca8ec2884/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/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= 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= @@ -894,10 +763,7 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ 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/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= @@ -916,30 +782,25 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 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/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -955,7 +816,6 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -964,64 +824,46 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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.0.0-20190918195907-bd6ac527cfd2/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo= -k8s.io/api v0.22.17 h1:FHL0caqndjQYjFV37ZdC4HX0RvCsW2SLKUM6Rpzogpg= -k8s.io/api v0.22.17/go.mod h1:6qVojJ3y+qIq7JSMwTH0BcPHl3dch4HefIC+4nguZhs= -k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604/go.mod h1:7H8sjDlWQu89yWB3FhZfsLyRCRLuoXoCoY5qtwW1q6I= -k8s.io/apiextensions-apiserver v0.22.17 h1:iNCZvU9DlAum6F6oqf0z//x3sLhZTd4OojGMxLPZTxM= -k8s.io/apiextensions-apiserver v0.22.17/go.mod h1:mLAmK33c0j1UJW03FtFSiJD0SVkDoedSKsoUwJyUfPc= -k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw= -k8s.io/apimachinery v0.22.17 h1:oXzfuLUA8E2hROqAVVaIF8pp8sBqbIVifbpzfuTL6F0= -k8s.io/apimachinery v0.22.17/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU= -k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1/go.mod h1:4FuDU+iKPjdsdQSN3GsEKZLB/feQsj1y9dhhBDVV2Ns= -k8s.io/apiserver v0.22.17/go.mod h1:zNXYCtXZ91AkmIUZgQ8lT9vdlDqgSkokJpds/F6DdGU= -k8s.io/client-go v0.0.0-20190918200256-06eb1244587a/go.mod h1:3YAcTbI2ArBRmhHns5vlHRX8YQqvkVYpz+U/N5i1mVU= -k8s.io/client-go v0.22.17 h1:rtZ7blsPatjMwiAsEcFjo27pHfu+bmAOGBoBCk/kGbA= -k8s.io/client-go v0.22.17/go.mod h1:SQPVpN+E/5Q/aSV7fYDT8VKVdaljhxI/t/84ADVJoC4= -k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I= -k8s.io/code-generator v0.22.17 h1:+HS1ZJB3gL5jCVwfuOoj7LccNWffvqXgVGRwquoHqL0= -k8s.io/code-generator v0.22.17/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU= -k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778/go.mod h1:DFWQCXgXVLiWtzFaS17KxHdlUeUymP7FLxZSkmL9/jU= -k8s.io/component-base v0.22.17/go.mod h1:Mrcvmxs+Ctx/xCYGWoFAvfZO9DC4gDgLtUbPJ4PjjUE= -k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/api v0.22.2 h1:M8ZzAD0V6725Fjg53fKeTJxGsJvRbk4TEm/fexHMtfw= +k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8= +k8s.io/apiextensions-apiserver v0.22.2 h1:zK7qI8Ery7j2CaN23UCFaC1hj7dMiI87n01+nKuewd4= +k8s.io/apiextensions-apiserver v0.22.2/go.mod h1:2E0Ve/isxNl7tWLSUDgi6+cmwHi5fQRdwGVCxbC+KFA= +k8s.io/apimachinery v0.22.2 h1:ejz6y/zNma8clPVfNDLnPbleBo6MpoFy/HBiBqCouVk= +k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= +k8s.io/apiserver v0.22.2/go.mod h1:vrpMmbyjWrgdyOvZTSpsusQq5iigKNWv9o9KlDAbBHI= +k8s.io/client-go v0.22.2 h1:DaSQgs02aCC1QcwUdkKZWOeaVsQjYvWv8ZazcZ6JcHc= +k8s.io/client-go v0.22.2/go.mod h1:sAlhrkVDf50ZHx6z4K0S40wISNTarf1r800F+RlCF6U= +k8s.io/code-generator v0.22.2 h1:+bUv9lpTnAWABtPkvO4x0kfz7j/kDEchVt0P/wXU3jQ= +k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= +k8s.io/component-base v0.22.2 h1:vNIvE0AIrLhjX8drH0BgCNJcR4QZxMXcJzBsDplDx9M= +k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllunGug= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= +k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= -k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= -k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= +k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/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/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/controller-runtime v0.3.0 h1:ZtdgqJXVHsIytjdmDuk0QjagnzyLq9FjojXRqIp+dU4= -sigs.k8s.io/controller-runtime v0.3.0/go.mod h1:Cw6PkEg0Sa7dAYovGT4R0tRkGhHXpYijwNxYhAnAZZk= -sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/controller-runtime v0.10.1 h1:+eLHgY/VrJWnfg6iXUqhCUqNXgPH1NZeP9drNAAgWlg= +sigs.k8s.io/controller-runtime v0.10.1/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs= -sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +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.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/integ/blue_green_deployment_test.go b/integ/blue_green_deployment_test.go index c29855a2..ccd8ad7b 100644 --- a/integ/blue_green_deployment_test.go +++ b/integ/blue_green_deployment_test.go @@ -1,10 +1,12 @@ package integ import ( + "context" + "github.com/go-kit/log" + "os" "time" "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -33,8 +35,9 @@ func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1. } func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { - log.Info("Starting test TestUpdateWithBlueGreenDeploymentMode") - + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestUpdateWithBlueGreenDeploymentMode") + ctx := context.Background() testName := "bluegreenupdate" const finalizer = "bluegreen.finalizers.test.com" @@ -54,7 +57,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { @@ -70,7 +73,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { c.Assert(newApp.Status.SavepointPath, NotNil) pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) // We have 2 applications running c.Assert(len(pods.Items), Equals, 4) @@ -83,14 +86,14 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { teardownVersion := newApp.Status.DeployVersion hashToTeardown := newApp.Status.DeployHash oldHash := newApp.Status.DeployHash - log.Infof("Tearing down version %s", teardownVersion) + logger.Log("message", "Tearing down version %s", teardownVersion) newApp = WaitForUpdate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.TearDownVersionHash = hashToTeardown }, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed) // wait for the old cluster to be cleaned up for { - pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name).List(v1.ListOptions{}) + pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name).List(ctx, v1.ListOptions{}) c.Assert(err, IsNil) oldPodFound := false @@ -115,9 +118,9 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { c.Assert(newApp.Status.VersionStatuses[1].JobStatus, Equals, v1beta1.FlinkJobStatus{}) pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "flink-app-hash=" + oldHash}) + List(ctx, v1.ListOptions{LabelSelector: "flink-app-hash=" + oldHash}) for _, pod := range pods.Items { - log.Infof("Pod name %s", pod.Name) + logger.Log("message", "Pod name %s", pod.Name) c.Assert(pod.Labels["flink-application-version"], Not(Equals), teardownVersion) } @@ -147,12 +150,12 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } } - log.Info("All pods torn down") - log.Info("Completed test TestUpdateWithBlueGreenDeploymentMode") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestUpdateWithBlueGreenDeploymentMode") } diff --git a/integ/checkpoint_failure_test.go b/integ/checkpoint_failure_test.go index 5004bbf0..aeed2de5 100644 --- a/integ/checkpoint_failure_test.go +++ b/integ/checkpoint_failure_test.go @@ -1,16 +1,17 @@ package integ import ( + "context" "fmt" - "time" - + "github.com/go-kit/log" "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "os" + "time" ) -func failingJobTest(s *IntegSuite, c *C, testName string, causeFailure func()) { +func failingJobTest(s *IntegSuite, c *C, ctx context.Context, testName string, causeFailure func(), logger log.Logger) { // create a Flink app config, err := s.Util.ReadFlinkApplication("test_app.yaml") c.Assert(err, IsNil, Commentf("Failed to read test app yaml")) @@ -54,34 +55,36 @@ func failingJobTest(s *IntegSuite, c *C, testName string, causeFailure func()) { for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } } - log.Info("All pods torn down") + logger.Log("message", "All pods torn down") } // Tests that we correctly handle updating a job with task failures func (s *IntegSuite) TestJobWithTaskFailures(c *C) { - log.Info("Starting test TestJobWithTaskFailures") - - failingJobTest(s, c, "taskfailure", func() { + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestJobWithTaskFailures") + ctx := context.Background() + failingJobTest(s, c, ctx, "taskfailure", func() { err := s.Util.ExecuteCommand("minikube", "ssh", "touch /tmp/checkpoints/fail && chmod 0644 /tmp/checkpoints/fail") c.Assert(err, IsNil) - }) - log.Info("Completed test TestJobWithTaskFailures") + }, logger) + logger.Log("message", "Completed test TestJobWithTaskFailures") } // Tests that we correctly handle updating a job with a checkpoint timeout func (s *IntegSuite) TestCheckpointTimeout(c *C) { - log.Info("Starting test TestCheckpointTimeout") - - failingJobTest(s, c, "checkpointtimeout", func() { + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestCheckpointTimeout") + ctx := context.Background() + failingJobTest(s, c, ctx, "checkpointtimeout", func() { // cause checkpoints to take 120 seconds err := s.Util.ExecuteCommand("minikube", "ssh", "echo 120000 >> /tmp/checkpoints/checkpoint_delay && sudo chmod 0644 /tmp/checkpoints/checkpoint_delay") c.Assert(err, IsNil) - }) - log.Info("Completed test TestCheckpointTimeout") + }, logger) + logger.Log("message", "Completed test TestCheckpointTimeout") } diff --git a/integ/job_cancellation_test.go b/integ/job_cancellation_test.go index 3daba8a7..d87bb224 100644 --- a/integ/job_cancellation_test.go +++ b/integ/job_cancellation_test.go @@ -1,16 +1,17 @@ package integ import ( + "context" "fmt" - "time" - + "github.com/go-kit/log" "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "os" + "time" ) -func WaitUpdateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { +func WaitUpdateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { // update with new appln image. app, err := s.Util.Update(name, updateFn) @@ -37,7 +38,7 @@ func WaitUpdateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app * // wait for the old cluster to be cleaned up for { - pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name).List(v1.ListOptions{}) + pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name).List(ctx, v1.ListOptions{}) c.Assert(err, IsNil) oldPodFound := false @@ -58,7 +59,9 @@ func WaitUpdateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app * // tests the workflow of job cancellation without savepoint func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { - log.Info("Starting test TestJobCancellationWithoutSavepoint") + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestJobCancellationWithoutSavepoint") + ctx := context.Background() testName := "cancelsuccess" const finalizer = "simple.finalizers.test.com" @@ -79,7 +82,7 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { @@ -87,7 +90,7 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { } // test updating the app with a new image - newApp := WaitUpdateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + newApp := WaitUpdateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }, v1beta1.FlinkApplicationDeployFailed) @@ -95,7 +98,7 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { c.Assert(newApp.Status.SavepointPath, Equals, "") pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { @@ -124,21 +127,22 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } } - log.Info("All pods torn down") - log.Info("Completed test TestJobCancellationWithoutSavepoint") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestJobCancellationWithoutSavepoint") } // tests a job update with the existing job already in cancelled state. // here, the new submitted job starts without a savepoint. func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { - log.Info("Starting test TestCancelledJobWithoutSavepoint") - + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestCancelledJobWithoutSavepoint") + ctx := context.Background() testName := "invalidcancel" config, err := s.Util.ReadFlinkApplication("test_app.yaml") c.Assert(err, IsNil, Commentf("Failed to read test app yaml")) @@ -201,20 +205,21 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } } - log.Info("All pods torn down") - log.Info("Completed test TestCancelledJobWithoutSavepoint") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestCancelledJobWithoutSavepoint") } // tests the recovery workflow of the job when savepoint is disabled. func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { - log.Info("Starting test TestJobRecoveryWithoutSavepoint") - + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestJobRecoveryWithoutSavepoint") + ctx := context.Background() const finalizer = "simple.finalizers.test.com" const testName = "cancelrecovery" @@ -262,7 +267,7 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { c.Assert(restored, IsNil) // roll forward with the right config. - _ = WaitUpdateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + _ = WaitUpdateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = config.Spec.JarName app.Spec.RestartNonce = "rollback2" app.Spec.Image = NewImage @@ -270,7 +275,7 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { // assert the pods have the new image pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) for _, pod := range pods.Items { c.Assert(pod.Spec.Containers[0].Image, Equals, NewImage) @@ -297,13 +302,13 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { // wait until all pods are deleted for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } time.Sleep(100 * time.Millisecond) } - log.Info("All pods torn down") - log.Info("Completed test TestJobRecoveryWithoutSavepoint") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestJobRecoveryWithoutSavepoint") } diff --git a/integ/main_test.go b/integ/main_test.go index 4a3ce8c9..c142dfa6 100644 --- a/integ/main_test.go +++ b/integ/main_test.go @@ -1,7 +1,10 @@ package integ import ( + "context" "fmt" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "os" "path/filepath" "testing" @@ -11,7 +14,6 @@ import ( integFramework "github.com/lyft/flinkk8soperator/integ/utils" controllerConfig "github.com/lyft/flinkk8soperator/pkg/controller/config" flyteConfig "github.com/lyft/flytestdlib/config" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,6 +31,8 @@ func Test(t *testing.T) { } func (s *IntegSuite) SetUpSuite(c *C) { + logger := log.NewLogfmtLogger(os.Stdout) + ctx := context.Background() // var namespace = flag.String("namespace", "flinkoperatortest", "namespace to use for testing") var namespace = os.Getenv("NAMESPACE") if namespace == "" { @@ -66,12 +70,12 @@ func (s *IntegSuite) SetUpSuite(c *C) { } var err error - s.Util, err = integFramework.New(namespace, kubeconfig, image, checkpointDir) + s.Util, err = integFramework.New(ctx, namespace, kubeconfig, image, checkpointDir) if err != nil { c.Fatalf("Failed to set up test util: %v", err) } - if err = s.Util.CreateCRD(); err != nil && !k8sErrors.IsAlreadyExists(err) { + if err = s.Util.CreateCRD(ctx); err != nil && !k8sErrors.IsAlreadyExists(err) { c.Fatalf("Failed to create CRD: %v", err) } @@ -85,7 +89,7 @@ func (s *IntegSuite) SetUpSuite(c *C) { ProxyPort: flyteConfig.Port{Port: 8001}, } - log.Info("Running operator directly") + logger.Log("message", "Running operator directly") go func() { if err = cmd.Run(&config); err != nil { @@ -93,32 +97,34 @@ func (s *IntegSuite) SetUpSuite(c *C) { } }() } else { - if err = s.Util.CreateClusterRole(); err != nil && !k8sErrors.IsAlreadyExists(err) { + if err = s.Util.CreateClusterRole(ctx); err != nil && !k8sErrors.IsAlreadyExists(err) { c.Fatalf("Failed to create role: %v", err) } - if err = s.Util.CreateServiceAccount(); err != nil && !k8sErrors.IsAlreadyExists(err) { + if err = s.Util.CreateServiceAccount(ctx); err != nil && !k8sErrors.IsAlreadyExists(err) { c.Fatalf("Failed to create service account: %v", err) } - if err = s.Util.CreateClusterRoleBinding(); err != nil && !k8sErrors.IsAlreadyExists(err) { + if err = s.Util.CreateClusterRoleBinding(ctx); err != nil && !k8sErrors.IsAlreadyExists(err) { c.Fatalf("Failed to create cluster role binding: %v", err) } - if err = s.Util.CreateOperator(); err != nil { + if err = s.Util.CreateOperator(ctx); err != nil { c.Fatalf("Failed to create operator: %v", err) } - if err = s.Util.TailOperatorLogs(); err != nil { + if err = s.Util.TailOperatorLogs(ctx); err != nil { c.Fatalf("Failed to tail operator logs: %v", err) } } } func (s *IntegSuite) TearDownSuite(c *C) { + logger := log.NewLogfmtLogger(os.Stdout) + ctx := context.Background() if s != nil && s.Util != nil { - log.Info("Cleaning up") - s.Util.Cleanup() + logger.Log("message", "Cleaning up") + s.Util.Cleanup(ctx) } } @@ -130,19 +136,21 @@ func (s *IntegSuite) SetUpTest(c *C) { } func (s *IntegSuite) TearDownTest(c *C) { - tms, err := s.Util.GetTaskManagerPods() + logger := log.NewLogfmtLogger(os.Stdout) + ctx := context.Background() + tms, err := s.Util.GetTaskManagerPods(ctx) if err == nil { for i, tm := range tms { fmt.Printf("\n\n######### TaskManager %d logs for debugging "+ "#########\n---------------------------\n", i) - _ = s.Util.GetLogs(tm, nil) + _ = s.Util.GetLogs(ctx, tm, nil) } } - jm, err := s.Util.GetJobManagerPod() + jm, err := s.Util.GetJobManagerPod(ctx) if err == nil { fmt.Printf("\n\n######### JobManager logs for debugging #########\n---------------------------\n") - _ = s.Util.GetLogs(jm, nil) + _ = s.Util.GetLogs(ctx, jm, nil) } fmt.Printf("\n\n######### Nodes for debugging #########\n---------------------------\n") @@ -163,7 +171,7 @@ func (s *IntegSuite) TearDownTest(c *C) { err = s.Util.FlinkApps().DeleteCollection(nil, v1.ListOptions{}) if err != nil { - log.Fatalf("Failed to clean up flink applications: %v", err) + level.Error(logger).Log("msg", "Failed to clean up flink applications: %v", err) } if err := s.Util.ExecuteCommand("minikube", "ssh", "sudo rm -rf /tmp/checkpoints"); err != nil { diff --git a/integ/scaleup_test.go b/integ/scaleup_test.go index 9a13602a..3b5fc4bc 100644 --- a/integ/scaleup_test.go +++ b/integ/scaleup_test.go @@ -1,19 +1,22 @@ package integ import ( + "context" "fmt" + "github.com/go-kit/log" + "os" "time" "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // TODO: https://github.com/lyft/flinkk8soperator/issues/278 func (s *IntegSuite) TestInPlaceScaleUp(c *C) { - - log.Info("Starting test TestInPlaceScaleUp") + ctx := context.Background() + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestInPlaceScaleUp") c.Skip("Skipping due to memory constraints in CI") const finalizer = "scaleup.finalizers.test.com" const testName = "test_in_place_scale_up" @@ -36,7 +39,7 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { @@ -44,12 +47,12 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { } deployments, err := s.Util.KubeClient.AppsV1().Deployments(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "flink-app=inplace,flink-deployment-type=taskmanager"}) + List(ctx, v1.ListOptions{LabelSelector: "flink-app=inplace,flink-deployment-type=taskmanager"}) c.Assert(err, IsNil) c.Assert(len(deployments.Items), Equals, 1) deployment := deployments.Items[0] - log.Info("Application started successfully") + logger.Log("message", "Application started successfully") // test updating the app with a new scale _, err = s.Util.Update("inplace", func(app *v1beta1.FlinkApplication) { @@ -62,7 +65,7 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { c.Assert(s.Util.WaitForPhase("inplace", v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(s.Util.WaitForAllTasksRunning("inplace"), IsNil) - log.Info("Rescaled job started successfully") + logger.Log("message", "Rescaled job started successfully") newApp, err := s.Util.GetFlinkApplication(config.Name) c.Assert(err, IsNil) @@ -79,25 +82,25 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { // check that we have the correct number of total pods pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 3) // check that we are still using the same deploymnet deployments2, err := s.Util.KubeClient.AppsV1().Deployments(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "flink-app=inplace,flink-deployment-type=taskmanager"}) + List(ctx, v1.ListOptions{LabelSelector: "flink-app=inplace,flink-deployment-type=taskmanager"}) c.Assert(err, IsNil) c.Assert(len(deployments2.Items), Equals, 1) deployment2 := deployments.Items[0] c.Assert(deployment2.Name, Equals, deployment.Name) // ensure that we can now proceed to a normal deployment - newApp = updateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + newApp = updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage - }, v1beta1.FlinkApplicationDeployFailed) + }, v1beta1.FlinkApplicationDeployFailed, logger) c.Assert(newApp.Spec.Image, Equals, NewImage) pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 3) for _, pod := range pods.Items { @@ -144,13 +147,13 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { // wait until all pods are gone for { pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=" + testName}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } time.Sleep(100 * time.Millisecond) } - log.Info("All pods torn down") - log.Info("Completed test TestInPlaceScaleUp") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestInPlaceScaleUp") } diff --git a/integ/simple_test.go b/integ/simple_test.go index 553ea978..5a9f5a51 100644 --- a/integ/simple_test.go +++ b/integ/simple_test.go @@ -1,14 +1,16 @@ package integ import ( + "context" "encoding/json" "fmt" + "github.com/go-kit/log" + "os" "time" "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" "github.com/lyft/flinkk8soperator/pkg/controller/flink/client" - "github.com/prometheus/common/log" . "gopkg.in/check.v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -16,7 +18,7 @@ import ( const NewImage = "lyft/operator-test-app:b1b3cb8e8f98bd41f44f9c89f8462ce255e0d13f.2" -func updateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { +func updateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase, logger log.Logger) *v1beta1.FlinkApplication { app, err := s.Util.Update(name, updateFn) c.Assert(err, IsNil) @@ -29,7 +31,7 @@ func updateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app *v1be c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), app.Status.JobStatus.JobID) - log.Info("New job started successfully") + logger.Log("message", "New job started successfully") // check that we savepointed and restored correctly endpoint := fmt.Sprintf("jobs/%s/checkpoints", newApp.Status.JobStatus.JobID) @@ -45,7 +47,7 @@ func updateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app *v1be // wait for the old cluster to be cleaned up for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "flink-app=" + name}) + List(ctx, v1.ListOptions{LabelSelector: "flink-app=" + name}) c.Assert(err, IsNil) oldPodFound := false @@ -68,8 +70,9 @@ func updateAndValidate(c *C, s *IntegSuite, name string, updateFn func(app *v1be // Tests job submission, upgrade, rollback, and deletion func (s *IntegSuite) TestSimple(c *C) { - log.Info("Starting test TestSimple") - + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestSimple") + ctx := context.Background() const finalizer = "simple.finalizers.test.com" // start a simple app @@ -87,23 +90,23 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=test_simple"}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=test_simple"}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { c.Assert(pod.Spec.Containers[0].Image, Equals, config.Spec.Image) } - log.Info("Application started successfully") + logger.Log("message", "Application started successfully") // test updating the app with a new image - newApp := updateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + newApp := updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage - }, v1beta1.FlinkApplicationDeployFailed) + }, v1beta1.FlinkApplicationDeployFailed, logger) // check that the pods have the new image c.Assert(newApp.Spec.Image, Equals, NewImage) pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=test_simple"}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=test_simple"}) c.Assert(err, IsNil) c.Assert(len(pods.Items), Equals, 2) for _, pod := range pods.Items { @@ -111,9 +114,9 @@ func (s *IntegSuite) TestSimple(c *C) { } // test updating the app with a config change - newApp = updateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + newApp = updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.FlinkConfig["akka.client.timeout"] = "23 s" - }, v1beta1.FlinkApplicationDeployFailed) + }, v1beta1.FlinkApplicationDeployFailed, logger) // validate the config has been applied res, err := s.Util.FlinkAPIGet(newApp, "/jobmanager/config") c.Assert(err, IsNil) @@ -132,7 +135,7 @@ func (s *IntegSuite) TestSimple(c *C) { // Test updating the app with a bad jar name -- this should cause a failed deploy and roll back { - log.Info("Testing rollback") + logger.Log("message", "Testing rollback") newApp, err := s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = "nonexistent.jar" // this shouldn't be needed after STRMCMP-473 is fixed @@ -145,7 +148,7 @@ func (s *IntegSuite) TestSimple(c *C) { // we should end up in the DeployFailed phase c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) - log.Info("Job is in deploy failed, waiting for tasks to start") + logger.Log("message", "Job is in deploy failed, waiting for tasks to start") // but the job should have been resubmitted c.Assert(s.Util.WaitForAllTasksRunning(newApp.Name), IsNil) @@ -167,19 +170,19 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(restored.(map[string]interface{})["is_savepoint"], Equals, true) - log.Info("Attempting to roll forward") + logger.Log("message", "Attempting to roll forward") // and we should be able to roll forward by resubmitting with a fixed config - updateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = config.Spec.JarName app.Spec.RestartNonce = "rollback2" - }, "") + }, "", logger) } // Test force rollback of an active deploy { - log.Info("Testing force rollback") + logger.Log("message", "Testing force rollback") newApp, err := s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = "lyft/badimage:latest" }) @@ -188,7 +191,7 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationClusterStarting, ""), IsNil) // User realizes error and cancels the deploy - log.Infof("Cancelling deploy...") + logger.Log("message", "Cancelling deploy...") newApp, err = s.Util.GetFlinkApplication(config.Name) c.Assert(err, IsNil) @@ -199,19 +202,19 @@ func (s *IntegSuite) TestSimple(c *C) { // we should end up in the DeployFailed phase c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) c.Assert(newApp.Spec.ForceRollback, Equals, true) - log.Info("User cancelled deploy. Job is in deploy failed, waiting for tasks to start") + logger.Log("message", "User cancelled deploy. Job is in deploy failed, waiting for tasks to start") // but the job should still be running c.Assert(newApp.Status.JobStatus.State, Equals, v1beta1.Running) - log.Info("Attempting to roll forward with fix") + logger.Log("message", "Attempting to roll forward with fix") // Fixing update // and we should be able to roll forward by resubmitting with a fixed config - updateAndValidate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage app.Spec.RestartNonce = "rollback3" app.Spec.ForceRollback = false - }, "") + }, "", logger) } // delete the application and ensure everything is cleaned up successfully @@ -254,20 +257,21 @@ func (s *IntegSuite) TestSimple(c *C) { // wait until all pods are gone for { pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=test_simple"}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=test_simple"}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } time.Sleep(100 * time.Millisecond) } - log.Info("All pods torn down") - log.Info("Completed test TestSimple") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestSimple") } func (s *IntegSuite) TestRecovery(c *C) { - log.Info("Starting test TestRecovery") - + logger := log.NewLogfmtLogger(os.Stdout) + logger.Log("message", "Starting test TestRecovery") + ctx := context.Background() config, err := s.Util.ReadFlinkApplication("test_app.yaml") c.Assert(err, IsNil, Commentf("Failed to read test app yaml")) @@ -286,13 +290,13 @@ func (s *IntegSuite) TestRecovery(c *C) { c.Assert(s.Util.CreateFlinkApplication(config), IsNil, Commentf("Failed to create flink application")) - log.Info("Application Created") + logger.Log("message", "Application Created") // wait for it to be running c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) - log.Info("Application running") + logger.Log("message", "Application running") // wait for checkpoints app, err := s.Util.GetFlinkApplication(config.Name) @@ -320,7 +324,7 @@ func (s *IntegSuite) TestRecovery(c *C) { err = s.Util.ExecuteCommand("minikube", "ssh", "touch /tmp/checkpoints/fail && chmod 0644 /tmp/checkpoints/fail") c.Assert(err, IsNil) - log.Info("Triggered failure") + logger.Log("message", "Triggered failure") // wait a bit time.Sleep(1 * time.Second) @@ -331,7 +335,7 @@ func (s *IntegSuite) TestRecovery(c *C) { }) c.Assert(err, IsNil) - log.Info("Updated app") + logger.Log("message", "Updated app") for { // wait until the new job is launched @@ -354,12 +358,12 @@ func (s *IntegSuite) TestRecovery(c *C) { c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). - List(v1.ListOptions{LabelSelector: "integTest=test_recovery"}) + List(ctx, v1.ListOptions{LabelSelector: "integTest=test_recovery"}) c.Assert(err, IsNil) if len(pods.Items) == 0 { break } } - log.Info("All pods torn down") - log.Info("Completed test TestRecovery") + logger.Log("message", "All pods torn down") + logger.Log("message", "Completed test TestRecovery") } diff --git a/integ/utils/utils.go b/integ/utils/utils.go index 637d5536..16182aac 100644 --- a/integ/utils/utils.go +++ b/integ/utils/utils.go @@ -1,9 +1,12 @@ package utils import ( + "context" "encoding/json" "errors" "fmt" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "io" "os" "os/exec" @@ -16,7 +19,6 @@ import ( flinkapp "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" clientset "github.com/lyft/flinkk8soperator/pkg/client/clientset/versioned" client "github.com/lyft/flinkk8soperator/pkg/client/clientset/versioned/typed/app/v1beta1" - "github.com/prometheus/common/log" resty "gopkg.in/resty.v1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -39,7 +41,7 @@ type TestUtil struct { CheckpointDir string } -func New(namespaceName string, kubeconfig string, image string, checkpointDir string) (*TestUtil, error) { +func New(ctx context.Context, namespaceName string, kubeconfig string, image string, checkpointDir string) (*TestUtil, error) { config, err := clientcmd.BuildConfigFromFlags("", kubeconfig) if err != nil { return nil, err @@ -52,16 +54,16 @@ func New(namespaceName string, kubeconfig string, image string, checkpointDir st var namespace *v1.Namespace if namespaceName == "default" { - namespace, err = client.CoreV1().Namespaces().Get("default", metav1.GetOptions{}) + namespace, err = client.CoreV1().Namespaces().Get(ctx, "default", metav1.GetOptions{}) if err != nil { return nil, err } } else { - namespace, err = client.CoreV1().Namespaces().Create(&v1.Namespace{ + namespace, err = client.CoreV1().Namespaces().Create(ctx, &v1.Namespace{ ObjectMeta: metav1.ObjectMeta{ Name: namespaceName, }, - }) + }, metav1.CreateOptions{}) if err != nil { return nil, err } @@ -87,11 +89,12 @@ func New(namespaceName string, kubeconfig string, image string, checkpointDir st }, nil } -func (f *TestUtil) Cleanup() { +func (f *TestUtil) Cleanup(ctx context.Context) { + logger := log.NewLogfmtLogger(os.Stdout) if f.Namespace.Name != "default" { flinkApps, err := f.FlinkApps().List(metav1.ListOptions{}) if err != nil { - log.Errorf("Failed to fetch flink apps during cleanup: %v", err) + level.Error(logger).Log("message", "Failed to fetch flink apps during cleanup: %v", err) } else { // make sure none of the apps have left-over finalizers for _, app := range flinkApps.Items { @@ -102,9 +105,9 @@ func (f *TestUtil) Cleanup() { } } } - err = f.KubeClient.CoreV1().Namespaces().Delete(f.Namespace.Name, &metav1.DeleteOptions{}) + err = f.KubeClient.CoreV1().Namespaces().Delete(ctx, f.Namespace.Name, metav1.DeleteOptions{}) if err != nil { - log.Errorf("Failed to clean up after test: %v", err) + level.Error(logger).Log("message", "Failed to clean up after test: %v", err) } } } @@ -132,7 +135,7 @@ func getFile(relativePath string) (*os.File, error) { return os.Open(path) } -func (f *TestUtil) CreateCRD() error { +func (f *TestUtil) CreateCRD(ctx context.Context) error { file, err := getFile("../deploy/crd.yaml") if err != nil { return err @@ -146,7 +149,7 @@ func (f *TestUtil) CreateCRD() error { crd.Namespace = f.Namespace.Name - _, err = f.APIExtensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(&crd) + _, err = f.APIExtensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(ctx, &crd, metav1.CreateOptions{}) if err != nil { return err } @@ -154,7 +157,7 @@ func (f *TestUtil) CreateCRD() error { return nil } -func (f *TestUtil) CreateClusterRole() error { +func (f *TestUtil) CreateClusterRole(ctx context.Context) error { file, err := getFile("../deploy/role.yaml") if err != nil { return err @@ -166,7 +169,7 @@ func (f *TestUtil) CreateClusterRole() error { return err } - _, err = f.KubeClient.RbacV1().ClusterRoles().Create(&clusterRole) + _, err = f.KubeClient.RbacV1().ClusterRoles().Create(ctx, &clusterRole, metav1.CreateOptions{}) if err != nil { return err } @@ -174,7 +177,7 @@ func (f *TestUtil) CreateClusterRole() error { return nil } -func (f *TestUtil) CreateServiceAccount() error { +func (f *TestUtil) CreateServiceAccount(ctx context.Context) error { file, err := getFile("../deploy/role.yaml") if err != nil { return err @@ -188,7 +191,7 @@ func (f *TestUtil) CreateServiceAccount() error { serviceAccount.Namespace = f.Namespace.Name - _, err = f.KubeClient.CoreV1().ServiceAccounts(f.Namespace.Name).Create(&serviceAccount) + _, err = f.KubeClient.CoreV1().ServiceAccounts(f.Namespace.Name).Create(ctx, &serviceAccount, metav1.CreateOptions{}) if err != nil { return err } @@ -196,7 +199,7 @@ func (f *TestUtil) CreateServiceAccount() error { return nil } -func (f *TestUtil) CreateClusterRoleBinding() error { +func (f *TestUtil) CreateClusterRoleBinding(ctx context.Context) error { file, err := getFile("../deploy/role-binding.yaml") if err != nil { return err @@ -215,7 +218,7 @@ func (f *TestUtil) CreateClusterRoleBinding() error { }} clusterRoleBinding.Namespace = f.Namespace.Name - _, err = f.KubeClient.RbacV1().ClusterRoleBindings().Create(&clusterRoleBinding) + _, err = f.KubeClient.RbacV1().ClusterRoleBindings().Create(ctx, &clusterRoleBinding, metav1.CreateOptions{}) if err != nil { return err } @@ -223,7 +226,7 @@ func (f *TestUtil) CreateClusterRoleBinding() error { return nil } -func (f *TestUtil) CreateOperator() error { +func (f *TestUtil) CreateOperator(ctx context.Context) error { configValue := make(map[string]string) configValue["development"] = "operator:\n containerNameFormat: \"%s-unknown\"\n resyncPeriod: 5s\n" + " baseBackoffDuration: 50ms\n maxBackoffDuration: 2s\n maxErrDuration: 240s\n" + @@ -237,7 +240,7 @@ func (f *TestUtil) CreateOperator() error { Data: configValue, } - if _, err := f.KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(&configMap); err != nil { + if _, err := f.KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(ctx, &configMap, metav1.CreateOptions{}); err != nil { return err } @@ -309,15 +312,15 @@ func (f *TestUtil) CreateOperator() error { }, } - if _, err := f.KubeClient.AppsV1().Deployments(f.Namespace.Name).Create(&deployment); err != nil { + if _, err := f.KubeClient.AppsV1().Deployments(f.Namespace.Name).Create(ctx, &deployment, metav1.CreateOptions{}); err != nil { return err } return nil } -func (f *TestUtil) GetJobManagerPod() (string, error) { - pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{}) +func (f *TestUtil) GetJobManagerPod(ctx context.Context) (string, error) { + pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(ctx, metav1.ListOptions{}) if err != nil { return "", err } @@ -331,9 +334,9 @@ func (f *TestUtil) GetJobManagerPod() (string, error) { return "", errors.New("no jobmanager pod found") } -func (f *TestUtil) GetTaskManagerPods() ([]string, error) { +func (f *TestUtil) GetTaskManagerPods(ctx context.Context) ([]string, error) { tms := make([]string, 0) - pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{}) + pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(ctx, metav1.ListOptions{}) if err != nil { return tms, err @@ -348,7 +351,7 @@ func (f *TestUtil) GetTaskManagerPods() ([]string, error) { return tms, nil } -func (f *TestUtil) GetLogs(podName string, lines *int64) error { +func (f *TestUtil) GetLogs(ctx context.Context, podName string, lines *int64) error { req := f.KubeClient.CoreV1().Pods(f.Namespace.Name). GetLogs(podName, &v1.PodLogOptions{ @@ -356,7 +359,7 @@ func (f *TestUtil) GetLogs(podName string, lines *int64) error { Follow: false, }) - readCloser, err := req.Stream() + readCloser, err := req.Stream(ctx) if err != nil { return err } @@ -371,10 +374,11 @@ func (f *TestUtil) GetLogs(podName string, lines *int64) error { return nil } -func (f *TestUtil) TailOperatorLogs() error { +func (f *TestUtil) TailOperatorLogs(ctx context.Context) error { + logger := log.NewLogfmtLogger(os.Stdout) var podName string for { - pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{ + pods, err := f.KubeClient.CoreV1().Pods(f.Namespace.Name).List(ctx, metav1.ListOptions{ LabelSelector: "app=flinkk8soperator", }) @@ -384,14 +388,14 @@ func (f *TestUtil) TailOperatorLogs() error { if len(pods.Items) == 0 || len(pods.Items[0].Status.ContainerStatuses) == 0 || !pods.Items[0].Status.ContainerStatuses[0].Ready { time.Sleep(500 * time.Millisecond) - log.Info("Waiting for operator container to be ready...") + logger.Log("message", "Waiting for operator container to be ready...") } else { podName = pods.Items[0].Name break } } - log.Infof("Found operator pod %s, starting to tail logs...", podName) + logger.Log("message", "Found operator pod %s, starting to tail logs...", podName) req := f.KubeClient.CoreV1().RESTClient().Get(). Namespace(f.Namespace.Name). @@ -400,7 +404,7 @@ func (f *TestUtil) TailOperatorLogs() error { SubResource("log"). Param("follow", "true") - readerCloser, err := req.Stream() + readerCloser, err := req.Stream(ctx) if err != nil { return err } @@ -409,7 +413,7 @@ func (f *TestUtil) TailOperatorLogs() error { defer readerCloser.Close() _, err = io.Copy(os.Stderr, readerCloser) if err != nil { - log.Errorf("Lost connection to operator logs %v", err) + level.Error(logger).Log("message", "Lost connection to operator logs %v", err) } }() @@ -589,6 +593,7 @@ func (f *TestUtil) WaitForAllTasksRunning(name string) error { } func (f *TestUtil) Update(name string, updateFn func(app *flinkapp.FlinkApplication)) (*flinkapp.FlinkApplication, error) { + logger := log.NewLogfmtLogger(os.Stdout) for { newApp, err := f.GetFlinkApplication(name) if err != nil { @@ -608,7 +613,7 @@ func (f *TestUtil) Update(name string, updateFn func(app *flinkapp.FlinkApplicat return nil, err } - log.Warn("Got conflict while updating... retrying") + level.Warn(logger).Log("message", "Got conflict while updating... retrying") time.Sleep(500 * time.Millisecond) } } diff --git a/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go index 1085cff1..273930d1 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go @@ -3,6 +3,7 @@ package v1beta1 import ( + "context" "time" v1beta1 "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" @@ -47,20 +48,20 @@ func newFlinkApplications(c *FlinkV1beta1Client, namespace string) *flinkApplica } // Get takes name of the flinkApplication, and returns the corresponding flinkApplication object, and an error if there is any. -func (c *flinkApplications) Get(name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Get(). Namespace(c.ns). Resource("flinkapplications"). Name(name). VersionedParams(&options, scheme.ParameterCodec). - Do(). + Do(ctx). Into(result) return } // List takes label and field selectors, and returns the list of FlinkApplications that match those selectors. -func (c *flinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { +func (c *flinkApplications) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second @@ -71,13 +72,13 @@ func (c *flinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkAppl Resource("flinkapplications"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). - Do(). + Do(ctx). Into(result) return } // Watch returns a watch.Interface that watches the requested flinkApplications. -func (c *flinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) { +func (c *flinkApplications) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second @@ -88,47 +89,47 @@ func (c *flinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) Resource("flinkapplications"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). - Watch() + Watch(ctx) } // Create takes the representation of a flinkApplication and creates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *flinkApplications) Create(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Create(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Post(). Namespace(c.ns). Resource("flinkapplications"). Body(flinkApplication). - Do(). + Do(ctx). Into(result) return } // Update takes the representation of a flinkApplication and updates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *flinkApplications) Update(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Update(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Put(). Namespace(c.ns). Resource("flinkapplications"). Name(flinkApplication.Name). Body(flinkApplication). - Do(). + Do(ctx). Into(result) return } // Delete takes name of the flinkApplication and deletes it. Returns an error if one occurs. -func (c *flinkApplications) Delete(name string, options *v1.DeleteOptions) error { +func (c *flinkApplications) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("flinkapplications"). Name(name). Body(options). - Do(). + Do(ctx). Error() } // DeleteCollection deletes a collection of objects. -func (c *flinkApplications) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { +func (c *flinkApplications) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error { var timeout time.Duration if listOptions.TimeoutSeconds != nil { timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second @@ -139,12 +140,12 @@ func (c *flinkApplications) DeleteCollection(options *v1.DeleteOptions, listOpti VersionedParams(&listOptions, scheme.ParameterCodec). Timeout(timeout). Body(options). - Do(). + Do(ctx). Error() } // Patch applies the patch and returns the patched flinkApplication. -func (c *flinkApplications) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Patch(pt). Namespace(c.ns). @@ -152,7 +153,7 @@ func (c *flinkApplications) Patch(name string, pt types.PatchType, data []byte, SubResource(subresources...). Name(name). Body(data). - Do(). + Do(ctx). Into(result) return } diff --git a/pkg/client/clientset/versioned/typed/app/v1beta2/app_client.go b/pkg/client/clientset/versioned/typed/app/v1beta2/app_client.go index 5fdf3da5..838b92b2 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta2/app_client.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta2/app_client.go @@ -5,7 +5,6 @@ package v1beta1 import ( v1beta1 "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" "github.com/lyft/flinkk8soperator/pkg/client/clientset/versioned/scheme" - serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" ) @@ -55,7 +54,7 @@ func setConfigDefaults(config *rest.Config) error { gv := v1beta1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go index d71015d2..e996edb8 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go @@ -3,6 +3,7 @@ package v1beta1 import ( + "context" "time" v1beta1 "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" @@ -47,20 +48,20 @@ func newFlinkApplications(c *FlinkV1beta2Client, namespace string) *flinkApplica } // Get takes name of the flinkApplication, and returns the corresponding flinkApplication object, and an error if there is any. -func (c *flinkApplications) Get(name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Get(). Namespace(c.ns). Resource("flinkapplications"). Name(name). VersionedParams(&options, scheme.ParameterCodec). - Do(). + Do(ctx). Into(result) return } // List takes label and field selectors, and returns the list of FlinkApplications that match those selectors. -func (c *flinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { +func (c *flinkApplications) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second @@ -71,13 +72,13 @@ func (c *flinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkAppl Resource("flinkapplications"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). - Do(). + Do(ctx). Into(result) return } // Watch returns a watch.Interface that watches the requested flinkApplications. -func (c *flinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) { +func (c *flinkApplications) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { var timeout time.Duration if opts.TimeoutSeconds != nil { timeout = time.Duration(*opts.TimeoutSeconds) * time.Second @@ -88,47 +89,47 @@ func (c *flinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) Resource("flinkapplications"). VersionedParams(&opts, scheme.ParameterCodec). Timeout(timeout). - Watch() + Watch(ctx) } // Create takes the representation of a flinkApplication and creates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *flinkApplications) Create(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Create(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Post(). Namespace(c.ns). Resource("flinkapplications"). Body(flinkApplication). - Do(). + Do(ctx). Into(result) return } // Update takes the representation of a flinkApplication and updates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *flinkApplications) Update(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Update(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Put(). Namespace(c.ns). Resource("flinkapplications"). Name(flinkApplication.Name). Body(flinkApplication). - Do(). + Do(ctx). Into(result) return } // Delete takes name of the flinkApplication and deletes it. Returns an error if one occurs. -func (c *flinkApplications) Delete(name string, options *v1.DeleteOptions) error { +func (c *flinkApplications) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error { return c.client.Delete(). Namespace(c.ns). Resource("flinkapplications"). Name(name). Body(options). - Do(). + Do(ctx). Error() } // DeleteCollection deletes a collection of objects. -func (c *flinkApplications) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { +func (c *flinkApplications) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error { var timeout time.Duration if listOptions.TimeoutSeconds != nil { timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second @@ -139,12 +140,12 @@ func (c *flinkApplications) DeleteCollection(options *v1.DeleteOptions, listOpti VersionedParams(&listOptions, scheme.ParameterCodec). Timeout(timeout). Body(options). - Do(). + Do(ctx). Error() } // Patch applies the patch and returns the patched flinkApplication. -func (c *flinkApplications) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { +func (c *flinkApplications) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { result = &v1beta1.FlinkApplication{} err = c.client.Patch(pt). Namespace(c.ns). @@ -152,7 +153,7 @@ func (c *flinkApplications) Patch(name string, pt types.PatchType, data []byte, SubResource(subresources...). Name(name). Body(data). - Do(). + Do(ctx). Into(result) return } diff --git a/pkg/controller/flink/client/error_handler.go b/pkg/controller/flink/client/error_handler.go index 74f0f255..60bf1125 100644 --- a/pkg/controller/flink/client/error_handler.go +++ b/pkg/controller/flink/client/error_handler.go @@ -10,7 +10,6 @@ import ( "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/util/clock" ) // appError codes @@ -56,9 +55,9 @@ func min(a, b int) int { type RetryHandlerInterface interface { IsErrorRetryable(err error) bool IsRetryRemaining(err error, retryCount int32) bool - WaitOnError(clock clock.Clock, lastUpdatedTime time.Time) (time.Duration, bool) + WaitOnError(lastUpdatedTime time.Time) (time.Duration, bool) GetRetryDelay(retryCount int32) time.Duration - IsTimeToRetry(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool + IsTimeToRetry(lastUpdatedTime time.Time, retryCount int32) bool } // A Retryer that has methods to determine if an error is retryable and also does exponential backoff @@ -92,8 +91,8 @@ func (r RetryHandler) IsRetryRemaining(err error, retryCount int32) bool { return false } -func (r RetryHandler) WaitOnError(clock clock.Clock, lastUpdatedTime time.Time) (time.Duration, bool) { - elapsedTime := clock.Since(lastUpdatedTime) +func (r RetryHandler) WaitOnError(lastUpdatedTime time.Time) (time.Duration, bool) { + elapsedTime := time.Since(lastUpdatedTime) return elapsedTime, elapsedTime <= r.maxErrDuration } @@ -106,8 +105,8 @@ func (r RetryHandler) GetRetryDelay(retryCount int32) time.Duration { delay := 1 << uint(retryCount) * (rand.Intn(timeInMillis) + timeInMillis) // nolint: gosec return time.Duration(min(delay, maxBackoffMillis)) * time.Millisecond } -func (r RetryHandler) IsTimeToRetry(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool { - elapsedTime := clock.Since(lastUpdatedTime) +func (r RetryHandler) IsTimeToRetry(lastUpdatedTime time.Time, retryCount int32) bool { + elapsedTime := time.Since(lastUpdatedTime) return elapsedTime >= r.GetRetryDelay(retryCount) } diff --git a/pkg/controller/flink/client/error_handler_test.go b/pkg/controller/flink/client/error_handler_test.go index fd6ee52a..b676ce36 100644 --- a/pkg/controller/flink/client/error_handler_test.go +++ b/pkg/controller/flink/client/error_handler_test.go @@ -4,8 +4,6 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -63,8 +61,6 @@ func TestRetryHandler_IsTimeToRetry(t *testing.T) { retryer := getTestRetryer() currTime := metav1.NewTime(time.Now()) olderTime := currTime.Add(-5 * time.Second) - fakeClock := clock.NewFakeClock(currTime.Time) - fakeClock.SetTime(time.Now()) // Set retry count to 0 to keep retry delay small - assert.True(t, retryer.IsTimeToRetry(fakeClock, olderTime, 0)) + assert.True(t, retryer.IsTimeToRetry(olderTime, 0)) } diff --git a/pkg/controller/flink/job_manager_controller.go b/pkg/controller/flink/job_manager_controller.go index c8d1834f..a3f71807 100644 --- a/pkg/controller/flink/job_manager_controller.go +++ b/pkg/controller/flink/job_manager_controller.go @@ -299,7 +299,7 @@ func FetchJobManagerContainerObj(application *v1beta1.FlinkApplication) *coreV1. EnvFrom: jmConfig.EnvConfig.EnvFrom, VolumeMounts: application.Spec.VolumeMounts, ReadinessProbe: &coreV1.Probe{ - Handler: coreV1.Handler{ + ProbeHandler: coreV1.ProbeHandler{ HTTPGet: &coreV1.HTTPGetAction{ Path: JobManagerReadinessPath, Port: intstr.FromInt(int(getUIPort(application))), diff --git a/pkg/controller/flink/mock/mock_error_handler.go b/pkg/controller/flink/mock/mock_error_handler.go index 8350927f..2f7d2dc5 100644 --- a/pkg/controller/flink/mock/mock_error_handler.go +++ b/pkg/controller/flink/mock/mock_error_handler.go @@ -2,16 +2,14 @@ package mock import ( "time" - - "k8s.io/apimachinery/pkg/util/clock" ) type IsErrorRetryableFunc func(err error) bool type IsRetryRemainingFunc func(err error, retryCount int32) bool type IsErrorFailFastFunc func(err error) bool -type WaitOnErrorFunc func(clock clock.Clock, lastUpdatedTime time.Time) (time.Duration, bool) +type WaitOnErrorFunc func(lastUpdatedTime time.Time) (time.Duration, bool) type GetRetryDelayFunc func(retryCount int32) time.Duration -type IsTimeToRetryFunc func(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool +type IsTimeToRetryFunc func(lastUpdatedTime time.Time, retryCount int32) bool type RetryHandler struct { IsErrorRetryableFunc IsErrorRetryableFunc @@ -46,9 +44,9 @@ func (e RetryHandler) IsRetryRemaining(err error, retryCount int32) bool { return false } -func (e RetryHandler) WaitOnError(clock clock.Clock, lastUpdatedTime time.Time) (time.Duration, bool) { +func (e RetryHandler) WaitOnError(lastUpdatedTime time.Time) (time.Duration, bool) { if e.WaitOnErrorFunc != nil { - return e.WaitOnErrorFunc(clock, lastUpdatedTime) + return e.WaitOnErrorFunc(lastUpdatedTime) } return time.Duration(time.Now().UnixNano()), true @@ -62,9 +60,9 @@ func (e RetryHandler) GetRetryDelay(retryCount int32) time.Duration { return time.Duration(time.Now().UnixNano()) } -func (e RetryHandler) IsTimeToRetry(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool { +func (e RetryHandler) IsTimeToRetry(lastUpdatedTime time.Time, retryCount int32) bool { if e.IsTimeToRetryFunc != nil { - return e.IsTimeToRetryFunc(clock, lastUpdatedTime, retryCount) + return e.IsTimeToRetryFunc(lastUpdatedTime, retryCount) } return false } diff --git a/pkg/controller/flinkapplication/flink_state_machine.go b/pkg/controller/flinkapplication/flink_state_machine.go index 54d3e251..08c0543f 100644 --- a/pkg/controller/flinkapplication/flink_state_machine.go +++ b/pkg/controller/flinkapplication/flink_state_machine.go @@ -24,7 +24,6 @@ import ( "github.com/lyft/flytestdlib/promutils/labeled" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/clock" ) const ( @@ -42,7 +41,6 @@ type FlinkHandlerInterface interface { type FlinkStateMachine struct { flinkController flink.ControllerInterface k8Cluster k8.ClusterInterface - clock clock.Clock metrics *stateMachineMetrics retryHandler client.RetryHandlerInterface } @@ -113,7 +111,7 @@ func (s *FlinkStateMachine) shouldRollback(ctx context.Context, application *v1b // As a default, use a time based wait to determine whether to rollback or not. if application.Status.LastUpdatedAt != nil { - if _, ok := s.retryHandler.WaitOnError(s.clock, application.Status.LastUpdatedAt.Time); !ok { + if _, ok := s.retryHandler.WaitOnError(application.Status.LastUpdatedAt.Time); !ok { application.Status.LastSeenError = nil return true, fmt.Sprintf("failed to make progress after %v", config.GetConfig().MaxErrDuration) } @@ -135,7 +133,7 @@ func (s *FlinkStateMachine) Handle(ctx context.Context, application *v1beta1.Fli // Update k8s object if updateStatus { - now := v1.NewTime(s.clock.Now()) + now := v1.NewTime(time.Now()) application.Status.LastUpdatedAt = &now updateAppErr := s.k8Cluster.UpdateStatus(ctx, application) if updateAppErr != nil { @@ -221,13 +219,13 @@ func (s *FlinkStateMachine) IsTimeToHandlePhase(application *v1beta1.FlinkApplic } // If for some reason, the error update time is nil, set it so that retries can proceed if lastSeenError.LastErrorUpdateTime == nil { - now := v1.NewTime(s.clock.Now()) + now := v1.NewTime(time.Now()) application.Status.LastSeenError.LastErrorUpdateTime = &now return true } retryCount := application.Status.RetryCount if s.retryHandler.IsRetryRemaining(lastSeenError, retryCount) { - if s.retryHandler.IsTimeToRetry(s.clock, lastSeenError.LastErrorUpdateTime.Time, retryCount) { + if s.retryHandler.IsTimeToRetry(lastSeenError.LastErrorUpdateTime.Time, retryCount) { application.Status.RetryCount++ return true } @@ -1116,7 +1114,7 @@ func (s *FlinkStateMachine) compareAndUpdateError(application *v1beta1.FlinkAppl application.Status.LastSeenError = err.(*v1beta1.FlinkApplicationError) } - now := v1.NewTime(s.clock.Now()) + now := v1.NewTime(time.Now()) application.Status.LastSeenError.LastErrorUpdateTime = &now } @@ -1345,7 +1343,6 @@ func NewFlinkStateMachine(k8sCluster k8.ClusterInterface, eventRecorder record.E return &FlinkStateMachine{ k8Cluster: k8sCluster, flinkController: flink.NewController(k8sCluster, eventRecorder, config), - clock: clock.RealClock{}, metrics: metrics, retryHandler: createRetryHandler(), } diff --git a/pkg/controller/flinkapplication/flink_state_machine_test.go b/pkg/controller/flinkapplication/flink_state_machine_test.go index 4e962ea7..c40f6a3e 100644 --- a/pkg/controller/flinkapplication/flink_state_machine_test.go +++ b/pkg/controller/flinkapplication/flink_state_machine_test.go @@ -3,7 +3,6 @@ package flinkapplication import ( "context" "errors" - "testing" "time" @@ -23,7 +22,6 @@ import ( "github.com/lyft/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/clock" ) const testSavepointLocation = "location" @@ -35,7 +33,6 @@ func getTestStateMachine() FlinkStateMachine { return FlinkStateMachine{ flinkController: &mock.FlinkController{}, k8Cluster: &k8mock.K8Cluster{}, - clock: &clock.FakeClock{}, metrics: newStateMachineMetrics(testScope), retryHandler: &mock.RetryHandler{}, } @@ -1202,7 +1199,6 @@ func TestRollingBack(t *testing.T) { func TestIsApplicationStuck(t *testing.T) { stateMachineForTest := getTestStateMachine() - stateMachineForTest.clock.(*clock.FakeClock).SetTime(time.Now()) retryableErr := client.GetRetryableError(errors.New("blah"), "GetClusterOverview", "FAILED", 3) failFastError := client.GetNonRetryableError(errors.New("blah"), "SubmitJob", "400BadRequest") @@ -1604,7 +1600,7 @@ func TestRollbackWithRetryableError(t *testing.T) { return time.Minute * 5 } - mockRetryHandler.IsTimeToRetryFunc = func(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool { + mockRetryHandler.IsTimeToRetryFunc = func(lastUpdatedTime time.Time, retryCount int32) bool { return true } @@ -1854,10 +1850,9 @@ func TestForceRollback(t *testing.T) { } stateMachineForTest := getTestStateMachine() - stateMachineForTest.clock.(*clock.FakeClock).SetTime(time.Now()) mockRetryHandler := stateMachineForTest.retryHandler.(*mock.RetryHandler) - mockRetryHandler.WaitOnErrorFunc = func(clock clock.Clock, lastUpdatedTime time.Time) (duration time.Duration, b bool) { + mockRetryHandler.WaitOnErrorFunc = func(lastUpdatedTime time.Time) (duration time.Duration, b bool) { return time.Millisecond, true } @@ -1957,7 +1952,6 @@ func TestLastSeenErrTimeIsNil(t *testing.T) { mockRetryHandler.IsRetryRemainingFunc = func(err error, retryCount int32) bool { return true } - stateMachineForTest.clock.(*clock.FakeClock).SetTime(time.Now()) err := stateMachineForTest.Handle(context.Background(), &app) assert.Nil(t, err) @@ -2000,7 +1994,7 @@ func TestCheckSavepointStatusFailing(t *testing.T) { mockRetryHandler.IsErrorRetryableFunc = func(err error) bool { return true } - mockRetryHandler.IsTimeToRetryFunc = func(clock clock.Clock, lastUpdatedTime time.Time, retryCount int32) bool { + mockRetryHandler.IsTimeToRetryFunc = func(lastUpdatedTime time.Time, retryCount int32) bool { return true } mockRetryHandler.IsRetryRemainingFunc = func(err error, retryCount int32) bool { diff --git a/pkg/controller/k8/cluster.go b/pkg/controller/k8/cluster.go index 7e3708d8..7ea9d9db 100644 --- a/pkg/controller/k8/cluster.go +++ b/pkg/controller/k8/cluster.go @@ -2,6 +2,7 @@ package k8 import ( "context" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/api/errors" @@ -12,7 +13,6 @@ import ( v1 "k8s.io/api/apps/v1" coreV1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" From 545bb66397eb50dc559b6e7dfcb42e92289379d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 13:28:17 -0700 Subject: [PATCH 4/8] more fix --- go.mod | 6 +++--- go.sum | 10 +++------- .../typed/app/v1beta1/flinkapplication.go | 16 ++++++++-------- .../typed/app/v1beta2/flinkapplication.go | 16 ++++++++-------- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 026af3ce..63623b90 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/fatih/color v1.12.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v0.4.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.19.14 // indirect @@ -90,9 +90,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/component-base v0.22.2 // indirect k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect - k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/klog/v2 v2.9.0 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect + k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 645587a5..e1c18916 100644 --- a/go.sum +++ b/go.sum @@ -137,10 +137,8 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -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-logr/zapr v0.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -845,15 +843,13 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= +k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/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= diff --git a/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go index 273930d1..851763f9 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta1/flinkapplication.go @@ -22,14 +22,14 @@ type FlinkApplicationsGetter interface { // FlinkApplicationInterface has methods to work with FlinkApplication resources. type FlinkApplicationInterface interface { - Create(*v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) - Update(*v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) - Delete(name string, options *v1.DeleteOptions) error - DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1beta1.FlinkApplication, error) - List(opts v1.ListOptions) (*v1beta1.FlinkApplicationList, error) - Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) + Create(context.Context, *v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) + Update(context.Context, *v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) + Delete(ctx context.Context, name string, options *v1.DeleteOptions) error + DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(ctx context.Context, name string, options v1.GetOptions) (*v1beta1.FlinkApplication, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta1.FlinkApplicationList, error) + Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) FlinkApplicationExpansion } diff --git a/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go index e996edb8..e970659f 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta2/flinkapplication.go @@ -22,14 +22,14 @@ type FlinkApplicationsGetter interface { // FlinkApplicationInterface has methods to work with FlinkApplication resources. type FlinkApplicationInterface interface { - Create(*v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) - Update(*v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) - Delete(name string, options *v1.DeleteOptions) error - DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1beta1.FlinkApplication, error) - List(opts v1.ListOptions) (*v1beta1.FlinkApplicationList, error) - Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) + Create(context.Context, *v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) + Update(context.Context, *v1beta1.FlinkApplication) (*v1beta1.FlinkApplication, error) + Delete(ctx context.Context, name string, options *v1.DeleteOptions) error + DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(ctx context.Context, name string, options v1.GetOptions) (*v1beta1.FlinkApplication, error) + List(ctx context.Context, opts v1.ListOptions) (*v1beta1.FlinkApplicationList, error) + Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) FlinkApplicationExpansion } From 213aec97b221ba1c459ac071b298d4f02ee8498d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 13:45:27 -0700 Subject: [PATCH 5/8] add ctx --- integ/blue_green_deployment_test.go | 32 +++++++-------- integ/checkpoint_failure_test.go | 14 +++---- integ/job_cancellation_test.go | 62 ++++++++++++++--------------- integ/main_test.go | 2 +- integ/scaleup_test.go | 24 +++++------ integ/simple_test.go | 60 ++++++++++++++-------------- integ/utils/utils.go | 26 ++++++------ 7 files changed, 110 insertions(+), 110 deletions(-) diff --git a/integ/blue_green_deployment_test.go b/integ/blue_green_deployment_test.go index ccd8ad7b..e21a8e51 100644 --- a/integ/blue_green_deployment_test.go +++ b/integ/blue_green_deployment_test.go @@ -11,15 +11,15 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), phase v1beta1.FlinkApplicationPhase, failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { +func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), phase v1beta1.FlinkApplicationPhase, failurePhase v1beta1.FlinkApplicationPhase, ctx context.Context) *v1beta1.FlinkApplication { // update with new image. - app, err := s.Util.Update(name, updateFn) + app, err := s.Util.Update(ctx, name, updateFn) c.Assert(err, IsNil) for { // keep trying until the new job is launched - newApp, err := s.Util.GetFlinkApplication(name) + newApp, err := s.Util.GetFlinkApplication(ctx, name) c.Assert(err, IsNil) if newApp.Status.VersionStatuses[s.Util.GetCurrentStatusIndex(app)].JobStatus.JobID != "" { break @@ -27,10 +27,10 @@ func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1. time.Sleep(100 * time.Millisecond) } - c.Assert(s.Util.WaitForPhase(name, phase, failurePhase), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, name, phase, failurePhase), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, name), IsNil) - newApp, _ := s.Util.GetFlinkApplication(name) + newApp, _ := s.Util.GetFlinkApplication(ctx, name) return newApp } @@ -50,11 +50,11 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { config.ObjectMeta.Labels["integTest"] = testName config.Finalizers = append(config.Finalizers, finalizer) - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) @@ -67,7 +67,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { // test updating the app with a new image newApp := WaitForUpdate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage - }, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed) + }, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed, ctx) c.Assert(newApp.Spec.Image, Equals, NewImage) c.Assert(newApp.Status.SavepointPath, NotNil) @@ -77,7 +77,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { c.Assert(err, IsNil) // We have 2 applications running c.Assert(len(pods.Items), Equals, 4) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(s.Util.GetJobID(newApp), NotNil) c.Assert(newApp.Status.UpdatingVersion, Equals, v1beta1.BlueFlinkApplication) c.Assert(newApp.Status.DeployVersion, Equals, v1beta1.GreenFlinkApplication) @@ -89,7 +89,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { logger.Log("message", "Tearing down version %s", teardownVersion) newApp = WaitForUpdate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.TearDownVersionHash = hashToTeardown - }, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed) + }, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed, ctx) // wait for the old cluster to be cleaned up for { @@ -111,7 +111,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { time.Sleep(100 * time.Millisecond) } - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(newApp.Status.TeardownHash, NotNil) c.Assert(newApp.Status.DeployVersion, Equals, v1beta1.BlueFlinkApplication) c.Assert(newApp.Status.VersionStatuses[0].JobStatus.JobID, NotNil) @@ -128,10 +128,10 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { c.Assert(len(pods.Items), Equals, 0) // cleanup - c.Assert(s.Util.FlinkApps().Delete(newApp.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, newApp.Name, &v1.DeleteOptions{}), IsNil) var app *v1beta1.FlinkApplication for { - app, err = s.Util.GetFlinkApplication(config.Name) + app, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if len(app.Finalizers) == 1 && app.Finalizers[0] == finalizer { break @@ -145,7 +145,7 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { // delete our finalizer app.Finalizers = []string{} - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) for { diff --git a/integ/checkpoint_failure_test.go b/integ/checkpoint_failure_test.go index aeed2de5..98b4b492 100644 --- a/integ/checkpoint_failure_test.go +++ b/integ/checkpoint_failure_test.go @@ -20,29 +20,29 @@ func failingJobTest(s *IntegSuite, c *C, ctx context.Context, testName string, c config.ObjectMeta.Labels["integTest"] = testName - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) // Cause it to fail causeFailure() - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) // wait a bit for it to start failing time.Sleep(5 * time.Second) // Try to update it - app, err := s.Util.GetFlinkApplication(config.Name) + app, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) app.Spec.Image = NewImage - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) // because the checkpoint will fail, the app should move to deploy failed - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationDeployFailed), IsNil) // And the job should not have been updated - newApp, err := s.Util.GetFlinkApplication(config.Name) + newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Equals, app.Status.JobStatus.JobID) @@ -51,7 +51,7 @@ func failingJobTest(s *IntegSuite, c *C, ctx context.Context, testName string, c c.Assert(err, IsNil) // delete the application and ensure everything is cleaned up successfully - c.Assert(s.Util.FlinkApps().Delete(app.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, app.Name, &v1.DeleteOptions{}), IsNil) for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). diff --git a/integ/job_cancellation_test.go b/integ/job_cancellation_test.go index d87bb224..0f1c1c54 100644 --- a/integ/job_cancellation_test.go +++ b/integ/job_cancellation_test.go @@ -14,12 +14,12 @@ import ( func WaitUpdateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { // update with new appln image. - app, err := s.Util.Update(name, updateFn) + app, err := s.Util.Update(ctx, name, updateFn) c.Assert(err, IsNil) for { // keep trying until the new job is launched - newApp, err := s.Util.GetFlinkApplication(name) + newApp, err := s.Util.GetFlinkApplication(ctx, name) c.Assert(err, IsNil) if newApp.Status.JobStatus.JobID != "" && newApp.Status.JobStatus.JobID != app.Status.JobStatus.JobID { @@ -28,11 +28,11 @@ func WaitUpdateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string time.Sleep(100 * time.Millisecond) } - c.Assert(s.Util.WaitForPhase(name, v1beta1.FlinkApplicationRunning, failurePhase), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, name, v1beta1.FlinkApplicationRunning, failurePhase), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, name), IsNil) // check that the new job started from an empty savepoint. - newApp, _ := s.Util.GetFlinkApplication(name) + newApp, _ := s.Util.GetFlinkApplication(ctx, name) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), app.Status.JobStatus.JobID) c.Assert(newApp.Status.SavepointPath, Equals, "") @@ -75,11 +75,11 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { config.ObjectMeta.Labels["integTest"] = testName config.Finalizers = append(config.Finalizers, finalizer) - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) @@ -106,10 +106,10 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { } // cleanup - c.Assert(s.Util.FlinkApps().Delete(newApp.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, newApp.Name, &v1.DeleteOptions{}), IsNil) var app *v1beta1.FlinkApplication for { - app, err = s.Util.GetFlinkApplication(config.Name) + app, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if len(app.Finalizers) == 1 && app.Finalizers[0] == finalizer { break @@ -122,7 +122,7 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { // delete our finalizer app.Finalizers = []string{} - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) for { @@ -152,14 +152,14 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { config.Spec.SavepointDisabled = true config.ObjectMeta.Labels["integTest"] = testName - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) - currApp, _ := s.Util.GetFlinkApplication(config.Name) + currApp, _ := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(currApp.Status.SavepointPath, Equals, "") job := s.Util.GetJobOverview(currApp) c.Assert(job["status"], Equals, "RUNNING") @@ -175,14 +175,14 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { job = s.Util.GetJobOverview(currApp) c.Assert(job["status"], Equals, "CANCELED") - newApp, err := s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { + newApp, err := s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }) c.Assert(err, IsNil) for { // wait until the new job is launched - newApp, err := s.Util.GetFlinkApplication(config.Name) + newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if newApp.Status.JobStatus.JobID != "" && newApp.Status.JobStatus.JobID != currApp.Status.JobStatus.JobID { @@ -192,9 +192,9 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { } // we should end up in the Running of the new job - c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - newApp, err = s.Util.GetFlinkApplication(newApp.Name) + newApp, err = s.Util.GetFlinkApplication(ctx, newApp.Name) c.Assert(err, IsNil) job = s.Util.GetJobOverview(newApp) @@ -202,7 +202,7 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { c.Assert(newApp.Status.SavepointPath, Equals, "") // start deleting - c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, config.Name, &v1.DeleteOptions{}), IsNil) for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) @@ -232,26 +232,26 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { config.Spec.DeleteMode = v1beta1.DeleteModeForceCancel config.Spec.SavepointDisabled = true - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationSavepointing), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationSavepointing), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) - currApp, _ := s.Util.GetFlinkApplication(config.Name) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) + currApp, _ := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(currApp.Status.SavepointPath, Equals, "") // Test updating the app with a bad jar name -- this should cause a failed deploy and roll back - _, err = s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { + _, err = s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = "nonexistent.jar" app.Spec.RestartNonce = "rollback" }) c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) // assert the restart of the job with a new job id and old deploy hash. - newApp, err := s.Util.GetFlinkApplication(config.Name) + newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), currApp.Status.JobStatus.JobID) c.Assert(newApp.Status.SavepointPath, Equals, "") @@ -282,10 +282,10 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { } // delete the application and ensure everything is cleaned up successfully - c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, config.Name, &v1.DeleteOptions{}), IsNil) var app *v1beta1.FlinkApplication for { - app, err = s.Util.GetFlinkApplication(config.Name) + app, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if len(app.Finalizers) == 1 && app.Finalizers[0] == finalizer { break @@ -296,7 +296,7 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { c.Assert(app.Status.SavepointTriggerID, Equals, "") app.Finalizers = []string{} - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) // wait until all pods are deleted diff --git a/integ/main_test.go b/integ/main_test.go index c142dfa6..0b8a469a 100644 --- a/integ/main_test.go +++ b/integ/main_test.go @@ -169,7 +169,7 @@ func (s *IntegSuite) TearDownTest(c *C) { err = s.Util.ExecuteCommand("kubectl", "describe", "flinkapplications", "-n", "flinkoperatortest") c.Assert(err, IsNil) - err = s.Util.FlinkApps().DeleteCollection(nil, v1.ListOptions{}) + err = s.Util.FlinkApps().DeleteCollection(ctx, nil, v1.ListOptions{}) if err != nil { level.Error(logger).Log("msg", "Failed to clean up flink applications: %v", err) } diff --git a/integ/scaleup_test.go b/integ/scaleup_test.go index 3b5fc4bc..3d27bf40 100644 --- a/integ/scaleup_test.go +++ b/integ/scaleup_test.go @@ -32,11 +32,11 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { // add a finalizer so that the flinkapplication won't be deleted until we've had a chance to look at it config.Finalizers = append(config.Finalizers, finalizer) - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=" + testName}) @@ -55,18 +55,18 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { logger.Log("message", "Application started successfully") // test updating the app with a new scale - _, err = s.Util.Update("inplace", func(app *v1beta1.FlinkApplication) { + _, err = s.Util.Update(ctx, "inplace", func(app *v1beta1.FlinkApplication) { app.Spec.Parallelism = 4 }) c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase("inplace", v1beta1.FlinkApplicationRescaling, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForPhase("inplace", v1beta1.FlinkApplicationSavepointing, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForPhase("inplace", v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning("inplace"), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, "inplace", v1beta1.FlinkApplicationRescaling, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, "inplace", v1beta1.FlinkApplicationSavepointing, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, "inplace", v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, "inplace"), IsNil) logger.Log("message", "Rescaled job started successfully") - newApp, err := s.Util.GetFlinkApplication(config.Name) + newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) // check that we savepointed and restored correctly @@ -108,12 +108,12 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { } // delete the application and ensure everything is cleaned up successfully - c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, config.Name, &v1.DeleteOptions{}), IsNil) // validate that a savepoint was taken and the job was cancelled var app *v1beta1.FlinkApplication for { - app, err = s.Util.GetFlinkApplication(config.Name) + app, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if len(app.Finalizers) == 1 && app.Finalizers[0] == finalizer { @@ -141,7 +141,7 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { // delete our finalizer app.Finalizers = []string{} - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) // wait until all pods are gone diff --git a/integ/simple_test.go b/integ/simple_test.go index 5a9f5a51..74c63947 100644 --- a/integ/simple_test.go +++ b/integ/simple_test.go @@ -19,15 +19,15 @@ import ( const NewImage = "lyft/operator-test-app:b1b3cb8e8f98bd41f44f9c89f8462ce255e0d13f.2" func updateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase, logger log.Logger) *v1beta1.FlinkApplication { - app, err := s.Util.Update(name, updateFn) + app, err := s.Util.Update(ctx, name, updateFn) c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase(name, v1beta1.FlinkApplicationSavepointing, failurePhase), IsNil) - c.Assert(s.Util.WaitForPhase(name, v1beta1.FlinkApplicationRunning, failurePhase), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, name, v1beta1.FlinkApplicationSavepointing, failurePhase), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, name, v1beta1.FlinkApplicationRunning, failurePhase), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, name), IsNil) // check that it really updated - newApp, err := s.Util.GetFlinkApplication(name) + newApp, err := s.Util.GetFlinkApplication(ctx, name) c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), app.Status.JobStatus.JobID) @@ -83,11 +83,11 @@ func (s *IntegSuite) TestSimple(c *C) { // add a finalizer so that the flinkapplication won't be deleted until we've had a chance to look at it config.Finalizers = append(config.Finalizers, finalizer) - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=test_simple"}) @@ -136,7 +136,7 @@ func (s *IntegSuite) TestSimple(c *C) { { logger.Log("message", "Testing rollback") - newApp, err := s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { + newApp, err := s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = "nonexistent.jar" // this shouldn't be needed after STRMCMP-473 is fixed app.Spec.RestartNonce = "rollback" @@ -144,18 +144,18 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationSavepointing, ""), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationSavepointing, ""), IsNil) // we should end up in the DeployFailed phase - c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) logger.Log("message", "Job is in deploy failed, waiting for tasks to start") // but the job should have been resubmitted - c.Assert(s.Util.WaitForAllTasksRunning(newApp.Name), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, newApp.Name), IsNil) // the job id should have changed jobID := newApp.Status.JobStatus.JobID - newApp, err = s.Util.GetFlinkApplication(newApp.Name) + newApp, err = s.Util.GetFlinkApplication(ctx, newApp.Name) c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), jobID) @@ -183,24 +183,24 @@ func (s *IntegSuite) TestSimple(c *C) { { logger.Log("message", "Testing force rollback") - newApp, err := s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { + newApp, err := s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = "lyft/badimage:latest" }) c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationClusterStarting, ""), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationClusterStarting, ""), IsNil) // User realizes error and cancels the deploy logger.Log("message", "Cancelling deploy...") - newApp, err = s.Util.GetFlinkApplication(config.Name) + newApp, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) newApp.Spec.ForceRollback = true - newApp, err = s.Util.FlinkApps().Update(newApp) + newApp, err = s.Util.FlinkApps().Update(ctx, newApp) c.Assert(err, IsNil) // we should end up in the DeployFailed phase - c.Assert(s.Util.WaitForPhase(newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) c.Assert(newApp.Spec.ForceRollback, Equals, true) logger.Log("message", "User cancelled deploy. Job is in deploy failed, waiting for tasks to start") @@ -218,12 +218,12 @@ func (s *IntegSuite) TestSimple(c *C) { } // delete the application and ensure everything is cleaned up successfully - c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, config.Name, &v1.DeleteOptions{}), IsNil) // validate that a savepoint was taken and the job was cancelled var app *v1beta1.FlinkApplication for { - app, err = s.Util.GetFlinkApplication(config.Name) + app, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if len(app.Finalizers) == 1 && app.Finalizers[0] == finalizer { @@ -251,7 +251,7 @@ func (s *IntegSuite) TestSimple(c *C) { // delete our finalizer app.Finalizers = []string{} - _, err = s.Util.FlinkApps().Update(app) + _, err = s.Util.FlinkApps().Update(ctx, app) c.Assert(err, IsNil) // wait until all pods are gone @@ -287,19 +287,19 @@ func (s *IntegSuite) TestRecovery(c *C) { config.Spec.TaskManagerConfig.EnvConfig.Env = append(config.Spec.TaskManagerConfig.EnvConfig.Env, envVar) - c.Assert(s.Util.CreateFlinkApplication(config), IsNil, + c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) logger.Log("message", "Application Created") // wait for it to be running - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) logger.Log("message", "Application running") // wait for checkpoints - app, err := s.Util.GetFlinkApplication(config.Name) + app, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) endpoint := fmt.Sprintf("jobs/%s/checkpoints", app.Status.JobStatus.JobID) @@ -330,7 +330,7 @@ func (s *IntegSuite) TestRecovery(c *C) { time.Sleep(1 * time.Second) // try to update the job - app, err = s.Util.Update(config.Name, func(app *v1beta1.FlinkApplication) { + app, err = s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }) c.Assert(err, IsNil) @@ -339,7 +339,7 @@ func (s *IntegSuite) TestRecovery(c *C) { for { // wait until the new job is launched - newApp, err := s.Util.GetFlinkApplication(config.Name) + newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) if newApp.Status.JobStatus.JobID != app.Status.JobStatus.JobID { break @@ -348,14 +348,14 @@ func (s *IntegSuite) TestRecovery(c *C) { } c.Assert(err, IsNil) - c.Assert(s.Util.WaitForPhase(config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) + c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) // stop it from failing c.Assert(s.Util.ExecuteCommand("minikube", "ssh", "sudo rm /tmp/checkpoints/fail"), IsNil) - c.Assert(s.Util.WaitForAllTasksRunning(config.Name), IsNil) + c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) // delete the application - c.Assert(s.Util.FlinkApps().Delete(config.Name, &v1.DeleteOptions{}), IsNil) + c.Assert(s.Util.FlinkApps().Delete(ctx, config.Name, &v1.DeleteOptions{}), IsNil) for { pods, err := s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "integTest=test_recovery"}) diff --git a/integ/utils/utils.go b/integ/utils/utils.go index 16182aac..031afafe 100644 --- a/integ/utils/utils.go +++ b/integ/utils/utils.go @@ -92,7 +92,7 @@ func New(ctx context.Context, namespaceName string, kubeconfig string, image str func (f *TestUtil) Cleanup(ctx context.Context) { logger := log.NewLogfmtLogger(os.Stdout) if f.Namespace.Name != "default" { - flinkApps, err := f.FlinkApps().List(metav1.ListOptions{}) + flinkApps, err := f.FlinkApps().List(ctx, metav1.ListOptions{}) if err != nil { level.Error(logger).Log("message", "Failed to fetch flink apps during cleanup: %v", err) } else { @@ -101,7 +101,7 @@ func (f *TestUtil) Cleanup(ctx context.Context) { app := app if len(app.Finalizers) != 0 { app.Finalizers = []string{} - _, _ = f.FlinkApps().Update(&app) + _, _ = f.FlinkApps().Update(ctx, &app) } } } @@ -441,19 +441,19 @@ func (f *TestUtil) FlinkApps() client.FlinkApplicationInterface { return f.FlinkApplicationClient.FlinkV1beta1().FlinkApplications(f.Namespace.Name) } -func (f *TestUtil) CreateFlinkApplication(application *flinkapp.FlinkApplication) error { - _, err := f.FlinkApps().Create(application) +func (f *TestUtil) CreateFlinkApplication(ctx context.Context, application *flinkapp.FlinkApplication) error { + _, err := f.FlinkApps().Create(ctx, application) return err } -func (f *TestUtil) GetFlinkApplication(name string) (*flinkapp.FlinkApplication, error) { - return f.FlinkApps().Get(name, metav1.GetOptions{}) +func (f *TestUtil) GetFlinkApplication(ctx context.Context, name string) (*flinkapp.FlinkApplication, error) { + return f.FlinkApps().Get(ctx, name, metav1.GetOptions{}) } -func (f *TestUtil) WaitForPhase(name string, phase flinkapp.FlinkApplicationPhase, failurePhases ...flinkapp.FlinkApplicationPhase) error { +func (f *TestUtil) WaitForPhase(ctx context.Context, name string, phase flinkapp.FlinkApplicationPhase, failurePhases ...flinkapp.FlinkApplicationPhase) error { waitTime := 0 for { - app, err := f.FlinkApps().Get(name, metav1.GetOptions{}) + app, err := f.FlinkApps().Get(ctx, name, metav1.GetOptions{}) if err != nil { return err @@ -557,8 +557,8 @@ func vertexRunning(vertex map[string]interface{}) bool { return true } -func (f *TestUtil) WaitForAllTasksRunning(name string) error { - flinkApp, err := f.GetFlinkApplication(name) +func (f *TestUtil) WaitForAllTasksRunning(ctx context.Context, name string) error { + flinkApp, err := f.GetFlinkApplication(ctx, name) if err != nil { return err } @@ -592,10 +592,10 @@ func (f *TestUtil) WaitForAllTasksRunning(name string) error { return nil } -func (f *TestUtil) Update(name string, updateFn func(app *flinkapp.FlinkApplication)) (*flinkapp.FlinkApplication, error) { +func (f *TestUtil) Update(ctx context.Context, name string, updateFn func(app *flinkapp.FlinkApplication)) (*flinkapp.FlinkApplication, error) { logger := log.NewLogfmtLogger(os.Stdout) for { - newApp, err := f.GetFlinkApplication(name) + newApp, err := f.GetFlinkApplication(ctx, name) if err != nil { return nil, err } @@ -603,7 +603,7 @@ func (f *TestUtil) Update(name string, updateFn func(app *flinkapp.FlinkApplicat // Update the app updateFn(newApp) - updated, err := f.FlinkApps().Update(newApp) + updated, err := f.FlinkApps().Update(ctx, newApp) if err == nil { return updated, nil From 5c059aae2bf31bc0a82815e0996d9316f6ccb129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 14:07:53 -0700 Subject: [PATCH 6/8] add more ctx --- .../app/v1beta1/fake/fake_flinkapplication.go | 17 +++++++++-------- .../app/v1beta2/fake/fake_flinkapplication.go | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkg/client/clientset/versioned/typed/app/v1beta1/fake/fake_flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta1/fake/fake_flinkapplication.go index ca76b697..b676c95b 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta1/fake/fake_flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta1/fake/fake_flinkapplication.go @@ -3,6 +3,7 @@ package fake import ( + "context" v1beta1 "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" @@ -23,7 +24,7 @@ var flinkapplicationsResource = schema.GroupVersionResource{Group: "flink.k8s.io var flinkapplicationsKind = schema.GroupVersionKind{Group: "flink.k8s.io", Version: "v1beta1", Kind: "FlinkApplication"} // Get takes name of the flinkApplication, and returns the corresponding flinkApplication object, and an error if there is any. -func (c *FakeFlinkApplications) Get(name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewGetAction(flinkapplicationsResource, c.ns, name), &v1beta1.FlinkApplication{}) @@ -34,7 +35,7 @@ func (c *FakeFlinkApplications) Get(name string, options v1.GetOptions) (result } // List takes label and field selectors, and returns the list of FlinkApplications that match those selectors. -func (c *FakeFlinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { +func (c *FakeFlinkApplications) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { obj, err := c.Fake. Invokes(testing.NewListAction(flinkapplicationsResource, flinkapplicationsKind, c.ns, opts), &v1beta1.FlinkApplicationList{}) @@ -56,14 +57,14 @@ func (c *FakeFlinkApplications) List(opts v1.ListOptions) (result *v1beta1.Flink } // Watch returns a watch.Interface that watches the requested flinkApplications. -func (c *FakeFlinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) { +func (c *FakeFlinkApplications) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(flinkapplicationsResource, c.ns, opts)) } // Create takes the representation of a flinkApplication and creates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *FakeFlinkApplications) Create(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Create(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewCreateAction(flinkapplicationsResource, c.ns, flinkApplication), &v1beta1.FlinkApplication{}) @@ -74,7 +75,7 @@ func (c *FakeFlinkApplications) Create(flinkApplication *v1beta1.FlinkApplicatio } // Update takes the representation of a flinkApplication and updates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *FakeFlinkApplications) Update(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Update(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewUpdateAction(flinkapplicationsResource, c.ns, flinkApplication), &v1beta1.FlinkApplication{}) @@ -85,7 +86,7 @@ func (c *FakeFlinkApplications) Update(flinkApplication *v1beta1.FlinkApplicatio } // Delete takes name of the flinkApplication and deletes it. Returns an error if one occurs. -func (c *FakeFlinkApplications) Delete(name string, options *v1.DeleteOptions) error { +func (c *FakeFlinkApplications) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error { _, err := c.Fake. Invokes(testing.NewDeleteAction(flinkapplicationsResource, c.ns, name), &v1beta1.FlinkApplication{}) @@ -93,7 +94,7 @@ func (c *FakeFlinkApplications) Delete(name string, options *v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *FakeFlinkApplications) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { +func (c *FakeFlinkApplications) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(flinkapplicationsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.FlinkApplicationList{}) @@ -101,7 +102,7 @@ func (c *FakeFlinkApplications) DeleteCollection(options *v1.DeleteOptions, list } // Patch applies the patch and returns the patched flinkApplication. -func (c *FakeFlinkApplications) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewPatchSubresourceAction(flinkapplicationsResource, c.ns, name, pt, data, subresources...), &v1beta1.FlinkApplication{}) diff --git a/pkg/client/clientset/versioned/typed/app/v1beta2/fake/fake_flinkapplication.go b/pkg/client/clientset/versioned/typed/app/v1beta2/fake/fake_flinkapplication.go index 1ee1d653..2f5ccfe5 100644 --- a/pkg/client/clientset/versioned/typed/app/v1beta2/fake/fake_flinkapplication.go +++ b/pkg/client/clientset/versioned/typed/app/v1beta2/fake/fake_flinkapplication.go @@ -3,6 +3,7 @@ package fake import ( + "context" v1beta1 "github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" @@ -23,7 +24,7 @@ var flinkapplicationsResource = schema.GroupVersionResource{Group: "flink.k8s.io var flinkapplicationsKind = schema.GroupVersionKind{Group: "flink.k8s.io", Version: "v1beta1", Kind: "FlinkApplication"} // Get takes name of the flinkApplication, and returns the corresponding flinkApplication object, and an error if there is any. -func (c *FakeFlinkApplications) Get(name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewGetAction(flinkapplicationsResource, c.ns, name), &v1beta1.FlinkApplication{}) @@ -34,7 +35,7 @@ func (c *FakeFlinkApplications) Get(name string, options v1.GetOptions) (result } // List takes label and field selectors, and returns the list of FlinkApplications that match those selectors. -func (c *FakeFlinkApplications) List(opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { +func (c *FakeFlinkApplications) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.FlinkApplicationList, err error) { obj, err := c.Fake. Invokes(testing.NewListAction(flinkapplicationsResource, flinkapplicationsKind, c.ns, opts), &v1beta1.FlinkApplicationList{}) @@ -56,14 +57,14 @@ func (c *FakeFlinkApplications) List(opts v1.ListOptions) (result *v1beta1.Flink } // Watch returns a watch.Interface that watches the requested flinkApplications. -func (c *FakeFlinkApplications) Watch(opts v1.ListOptions) (watch.Interface, error) { +func (c *FakeFlinkApplications) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { return c.Fake. InvokesWatch(testing.NewWatchAction(flinkapplicationsResource, c.ns, opts)) } // Create takes the representation of a flinkApplication and creates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *FakeFlinkApplications) Create(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Create(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewCreateAction(flinkapplicationsResource, c.ns, flinkApplication), &v1beta1.FlinkApplication{}) @@ -74,7 +75,7 @@ func (c *FakeFlinkApplications) Create(flinkApplication *v1beta1.FlinkApplicatio } // Update takes the representation of a flinkApplication and updates it. Returns the server's representation of the flinkApplication, and an error, if there is any. -func (c *FakeFlinkApplications) Update(flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Update(ctx context.Context, flinkApplication *v1beta1.FlinkApplication) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewUpdateAction(flinkapplicationsResource, c.ns, flinkApplication), &v1beta1.FlinkApplication{}) @@ -85,7 +86,7 @@ func (c *FakeFlinkApplications) Update(flinkApplication *v1beta1.FlinkApplicatio } // Delete takes name of the flinkApplication and deletes it. Returns an error if one occurs. -func (c *FakeFlinkApplications) Delete(name string, options *v1.DeleteOptions) error { +func (c *FakeFlinkApplications) Delete(ctx context.Context, name string, options *v1.DeleteOptions) error { _, err := c.Fake. Invokes(testing.NewDeleteAction(flinkapplicationsResource, c.ns, name), &v1beta1.FlinkApplication{}) @@ -93,7 +94,7 @@ func (c *FakeFlinkApplications) Delete(name string, options *v1.DeleteOptions) e } // DeleteCollection deletes a collection of objects. -func (c *FakeFlinkApplications) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { +func (c *FakeFlinkApplications) DeleteCollection(ctx context.Context, options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewDeleteCollectionAction(flinkapplicationsResource, c.ns, listOptions) _, err := c.Fake.Invokes(action, &v1beta1.FlinkApplicationList{}) @@ -101,7 +102,7 @@ func (c *FakeFlinkApplications) DeleteCollection(options *v1.DeleteOptions, list } // Patch applies the patch and returns the patched flinkApplication. -func (c *FakeFlinkApplications) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { +func (c *FakeFlinkApplications) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.FlinkApplication, err error) { obj, err := c.Fake. Invokes(testing.NewPatchSubresourceAction(flinkapplicationsResource, c.ns, name, pt, data, subresources...), &v1beta1.FlinkApplication{}) From fbbf05595f159a649e04fd5f69bb6c580c6e718f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 15:53:40 -0700 Subject: [PATCH 7/8] more fix --- cmd/flinkk8soperator/cmd/root.go | 2 +- pkg/controller/flink/flink.go | 6 +- pkg/controller/flink/flink_test.go | 7 +-- .../flink/job_manager_controller.go | 2 +- pkg/controller/flinkapplication/controller.go | 14 ++--- .../flink_state_machine_test.go | 60 +++++++++---------- pkg/controller/k8/cluster.go | 30 ++++------ pkg/controller/k8/mock/mock_k8.go | 18 +++--- 8 files changed, 65 insertions(+), 74 deletions(-) diff --git a/cmd/flinkk8soperator/cmd/root.go b/cmd/flinkk8soperator/cmd/root.go index 635c7397..52c9fe93 100644 --- a/cmd/flinkk8soperator/cmd/root.go +++ b/cmd/flinkk8soperator/cmd/root.go @@ -180,5 +180,5 @@ func operatorEntryPoint(ctx context.Context, metricsScope promutils.Scope, contr // Start the Cmd logger.Infof(ctx, "Starting the Cmd.") ctx, _ = signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM) - return mgr.Start(ctx.Done()) + return mgr.Start(ctx) } diff --git a/pkg/controller/flink/flink.go b/pkg/controller/flink/flink.go index 3b20bb15..8400579a 100644 --- a/pkg/controller/flink/flink.go +++ b/pkg/controller/flink/flink.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" "github.com/lyft/flinkk8soperator/pkg/controller/common" @@ -24,6 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + client2 "sigs.k8s.io/controller-runtime/pkg/client" ) const proxyURL = "http://localhost:%d/api/v1/namespaces/%s/services/%s:8081/proxy" @@ -439,7 +439,7 @@ func (f *Controller) DeleteOldResourcesForApp(ctx context.Context, app *v1beta1. deletedHashes := make(map[string]bool) for _, resource := range oldObjects { - err := f.k8Cluster.DeleteK8Object(ctx, resource.(runtime.Object)) + err := f.k8Cluster.DeleteK8Object(ctx, resource.(client2.Object)) if err != nil { f.metrics.deleteResourceFailedCounter.Inc(ctx) return err @@ -907,7 +907,7 @@ func (f *Controller) DeleteResourcesForAppWithHash(ctx context.Context, app *v1b deletedHashes := make(map[string]bool) for _, resource := range oldObjects { - err := f.k8Cluster.DeleteK8Object(ctx, resource.(runtime.Object)) + err := f.k8Cluster.DeleteK8Object(ctx, resource.(client2.Object)) if err != nil { f.metrics.deleteResourceFailedCounter.Inc(ctx) return err diff --git a/pkg/controller/flink/flink_test.go b/pkg/controller/flink/flink_test.go index 09b1dfc7..cd5425cd 100644 --- a/pkg/controller/flink/flink_test.go +++ b/pkg/controller/flink/flink_test.go @@ -2,6 +2,7 @@ package flink import ( "context" + client2 "sigs.k8s.io/controller-runtime/pkg/client" "testing" "github.com/lyft/flinkk8soperator/pkg/controller/config" @@ -24,8 +25,6 @@ import ( v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "k8s.io/apimachinery/pkg/runtime" ) const testImage = "123.xyz.com/xx:11ae1218924428faabd9b64423fa0c332efba6b2" @@ -359,7 +358,7 @@ func TestDeleteOldResources(t *testing.T) { } ctr := 0 - mockK8Cluster.DeleteK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.DeleteK8ObjectFunc = func(ctx context.Context, object client2.Object) error { ctr++ switch ctr { case 1: @@ -1092,7 +1091,7 @@ func TestDeleteResourcesForAppWithHash(t *testing.T) { } ctr := 0 - mockK8Cluster.DeleteK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.DeleteK8ObjectFunc = func(ctx context.Context, object client2.Object) error { ctr++ switch ctr { case 1: diff --git a/pkg/controller/flink/job_manager_controller.go b/pkg/controller/flink/job_manager_controller.go index a3f71807..c8d1834f 100644 --- a/pkg/controller/flink/job_manager_controller.go +++ b/pkg/controller/flink/job_manager_controller.go @@ -299,7 +299,7 @@ func FetchJobManagerContainerObj(application *v1beta1.FlinkApplication) *coreV1. EnvFrom: jmConfig.EnvConfig.EnvFrom, VolumeMounts: application.Spec.VolumeMounts, ReadinessProbe: &coreV1.Probe{ - ProbeHandler: coreV1.ProbeHandler{ + Handler: coreV1.Handler{ HTTPGet: &coreV1.HTTPGetAction{ Path: JobManagerReadinessPath, Port: intstr.FromInt(int(getUIPort(application))), diff --git a/pkg/controller/flinkapplication/controller.go b/pkg/controller/flinkapplication/controller.go index 54513b78..0b13b96e 100644 --- a/pkg/controller/flinkapplication/controller.go +++ b/pkg/controller/flinkapplication/controller.go @@ -18,7 +18,6 @@ import ( v1 "k8s.io/api/apps/v1" coreV1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" @@ -55,7 +54,7 @@ func newReconcilerMetrics(scope promutils.Scope) *reconcilerMetrics { } } -func (r *ReconcileFlinkApplication) getResource(ctx context.Context, key types.NamespacedName, obj runtime.Object) error { +func (r *ReconcileFlinkApplication) getResource(ctx context.Context, key types.NamespacedName, obj client.Object) error { err := r.cache.Get(ctx, key, obj) if err != nil && k8.IsK8sObjectDoesNotExist(err) { r.metrics.cacheMiss.Inc(ctx) @@ -82,8 +81,7 @@ func (r *ReconcileFlinkApplication) getReconcileResultForError(err error) reconc } } -func (r *ReconcileFlinkApplication) Reconcile(request reconcile.Request) (reconcile.Result, error) { - ctx := context.Background() +func (r *ReconcileFlinkApplication) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { ctx = contextutils.WithNamespace(ctx, request.Namespace) ctx = contextutils.WithAppName(ctx, request.Name) typeMeta := metaV1.TypeMeta{ @@ -171,16 +169,16 @@ func isOwnedByFlinkApplication(ownerReferences []metaV1.OwnerReference) bool { func getPredicateFuncs() predicate.Funcs { return predicate.Funcs{ CreateFunc: func(e event.CreateEvent) bool { - return isOwnedByFlinkApplication(e.Meta.GetOwnerReferences()) + return isOwnedByFlinkApplication(e.Object.GetOwnerReferences()) }, UpdateFunc: func(e event.UpdateEvent) bool { - return isOwnedByFlinkApplication(e.MetaNew.GetOwnerReferences()) + return isOwnedByFlinkApplication(e.ObjectNew.GetOwnerReferences()) }, DeleteFunc: func(e event.DeleteEvent) bool { - return isOwnedByFlinkApplication(e.Meta.GetOwnerReferences()) + return isOwnedByFlinkApplication(e.Object.GetOwnerReferences()) }, GenericFunc: func(e event.GenericEvent) bool { - return isOwnedByFlinkApplication(e.Meta.GetOwnerReferences()) + return isOwnedByFlinkApplication(e.Object.GetOwnerReferences()) }, } } diff --git a/pkg/controller/flinkapplication/flink_state_machine_test.go b/pkg/controller/flinkapplication/flink_state_machine_test.go index c40f6a3e..0ef901ce 100644 --- a/pkg/controller/flinkapplication/flink_state_machine_test.go +++ b/pkg/controller/flinkapplication/flink_state_machine_test.go @@ -3,6 +3,7 @@ package flinkapplication import ( "context" "errors" + client2 "sigs.k8s.io/controller-runtime/pkg/client" "testing" "time" @@ -21,7 +22,6 @@ import ( mockScope "github.com/lyft/flytestdlib/promutils" "github.com/lyft/flytestdlib/promutils/labeled" "github.com/stretchr/testify/assert" - "k8s.io/apimachinery/pkg/runtime" ) const testSavepointLocation = "location" @@ -51,7 +51,7 @@ func TestHandleNewOrCreate(t *testing.T) { stateMachineForTest := getTestStateMachine() mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationClusterStarting, application.Status.Phase) return nil @@ -71,7 +71,7 @@ func TestHandleStartingClusterStarting(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { return nil } err := stateMachineForTest.Handle(context.Background(), &v1beta1.FlinkApplication{ @@ -111,11 +111,11 @@ func TestHandleNewOrCreateWithSavepointDisabled(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { return nil } - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationCancelling, application.Status.Phase) updateInvoked = true @@ -158,7 +158,7 @@ func TestHandleApplicationCancel(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationSubmittingJob, application.Status.Phase) return nil @@ -195,7 +195,7 @@ func TestHandleApplicationCancelFailedWithMaxRetries(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { updateInvoked = true application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationRollingBackJob, application.Status.Phase) @@ -236,7 +236,7 @@ func TestHandleStartingDual(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationSavepointing, application.Status.Phase) updateInvoked = true @@ -264,7 +264,7 @@ func TestHandleApplicationSavepointingInitialDeploy(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationSubmittingJob, application.Status.Phase) updateInvoked = true @@ -313,7 +313,7 @@ func TestHandleApplicationSavepointingDual(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) updateCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) if updateCount == 0 { assert.Equal(t, "trigger", application.Status.SavepointTriggerID) @@ -359,7 +359,7 @@ func TestHandleApplicationSavepointingFailed(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Empty(t, application.Status.SavepointPath) assert.Equal(t, v1beta1.FlinkApplicationRecovering, application.Status.Phase) @@ -391,7 +391,7 @@ func TestRestoreFromExternalizedCheckpoint(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, "/tmp/checkpoint", application.Status.SavepointPath) assert.Equal(t, v1beta1.FlinkApplicationSubmittingJob, application.Status.Phase) @@ -531,7 +531,7 @@ func TestSubmittingToRunning(t *testing.T) { } updateCount := 0 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { if updateCount == 0 { // update to the service service := object.(*v1.Service) @@ -546,7 +546,7 @@ func TestSubmittingToRunning(t *testing.T) { } statusUpdateCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { if statusUpdateCount == 0 { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, jobID, mockFlinkController.GetLatestJobID(ctx, application)) @@ -703,7 +703,7 @@ func TestSubmittingVertexFailsToStart(t *testing.T) { } updateCount := 0 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { if updateCount == 0 { // update to the service service := object.(*v1.Service) @@ -718,7 +718,7 @@ func TestSubmittingVertexFailsToStart(t *testing.T) { } statusUpdateCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { if statusUpdateCount == 0 { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, jobID, mockFlinkController.GetLatestJobID(ctx, application)) @@ -864,7 +864,7 @@ func TestSubmittingVertexStartTimeout(t *testing.T) { } updateCount := 0 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { if updateCount == 0 { // update to the service service := object.(*v1.Service) @@ -879,7 +879,7 @@ func TestSubmittingVertexStartTimeout(t *testing.T) { } statusUpdateCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { if statusUpdateCount == 0 { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, jobID, mockFlinkController.GetLatestJobID(ctx, application)) @@ -979,13 +979,13 @@ func TestHandleNilDeployments(t *testing.T) { } updateCount := 0 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { updateCount++ return nil } statusUpdateCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { statusUpdateCount++ return nil } @@ -1003,7 +1003,7 @@ func TestHandleApplicationRunning(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { assert.True(t, false) return nil } @@ -1024,7 +1024,7 @@ func TestRunningToClusterStarting(t *testing.T) { } mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationUpdating, application.Status.Phase) updateInvoked = true @@ -1162,7 +1162,7 @@ func TestRollingBack(t *testing.T) { } updateCount := 0 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { if updateCount == 0 { // update to the service service := object.(*v1.Service) @@ -1177,7 +1177,7 @@ func TestRollingBack(t *testing.T) { } statusUpdated := false - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { if !statusUpdated { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, appHash, application.Status.FailedDeployHash) @@ -1292,7 +1292,7 @@ func TestDeleteWithSavepoint(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) updateStatusCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationDeleting, application.Status.Phase) @@ -1309,7 +1309,7 @@ func TestDeleteWithSavepoint(t *testing.T) { } updated := false - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { assert.Equal(t, 0, len(app.Finalizers)) updated = true return nil @@ -1404,7 +1404,7 @@ func TestDeleteWithSavepointAndFinishedJob(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationDeleting, application.Status.Phase) @@ -1461,7 +1461,7 @@ func TestDeleteWithForceCancel(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) updateCount := 1 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationDeleting, application.Status.Phase) @@ -1527,7 +1527,7 @@ func TestDeleteModeNone(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) updateCount := 1 - mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateK8ObjectFunc = func(ctx context.Context, object client2.Object) error { application := object.(*v1beta1.FlinkApplication) assert.Equal(t, v1beta1.FlinkApplicationDeleting, application.Status.Phase) @@ -1607,7 +1607,7 @@ func TestRollbackWithRetryableError(t *testing.T) { mockK8Cluster := stateMachineForTest.k8Cluster.(*k8mock.K8Cluster) updateErrCount := 0 - mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.UpdateStatusFunc = func(ctx context.Context, object client2.Object) error { updateErrCount++ return nil } diff --git a/pkg/controller/k8/cluster.go b/pkg/controller/k8/cluster.go index 7ea9d9db..7e6f486e 100644 --- a/pkg/controller/k8/cluster.go +++ b/pkg/controller/k8/cluster.go @@ -2,8 +2,6 @@ package k8 import ( "context" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/api/errors" "github.com/lyft/flinkk8soperator/pkg/controller/config" @@ -35,11 +33,11 @@ type ClusterInterface interface { GetService(ctx context.Context, namespace string, name string, version string) (*coreV1.Service, error) GetServicesWithLabel(ctx context.Context, namespace string, labelMap map[string]string) (*coreV1.ServiceList, error) - CreateK8Object(ctx context.Context, object runtime.Object) error - UpdateK8Object(ctx context.Context, object runtime.Object) error - DeleteK8Object(ctx context.Context, object runtime.Object) error + CreateK8Object(ctx context.Context, object client.Object) error + UpdateK8Object(ctx context.Context, object client.Object) error + DeleteK8Object(ctx context.Context, object client.Object) error - UpdateStatus(ctx context.Context, object runtime.Object) error + UpdateStatus(ctx context.Context, object client.Object) error } func NewK8Cluster(mgr manager.Manager, cfg config.RuntimeConfig) ClusterInterface { @@ -174,9 +172,8 @@ func (k *Cluster) GetServicesWithLabel(ctx context.Context, namespace string, la return serviceList, nil } -func (k *Cluster) CreateK8Object(ctx context.Context, object runtime.Object) error { - objCreate := object.DeepCopyObject() - err := k.client.Create(ctx, objCreate) +func (k *Cluster) CreateK8Object(ctx context.Context, object client.Object) error { + err := k.client.Create(ctx, object) if err != nil { if !errors.IsAlreadyExists(err) { logger.Errorf(ctx, "K8s object creation failed %v", err) @@ -189,9 +186,8 @@ func (k *Cluster) CreateK8Object(ctx context.Context, object runtime.Object) err return nil } -func (k *Cluster) UpdateK8Object(ctx context.Context, object runtime.Object) error { - objUpdate := object.DeepCopyObject() - err := k.client.Update(ctx, objUpdate) +func (k *Cluster) UpdateK8Object(ctx context.Context, object client.Object) error { + err := k.client.Update(ctx, object) if err != nil { if errors.IsConflict(err) { logger.Warnf(ctx, "Conflict while updating object") @@ -206,9 +202,8 @@ func (k *Cluster) UpdateK8Object(ctx context.Context, object runtime.Object) err return nil } -func (k *Cluster) UpdateStatus(ctx context.Context, object runtime.Object) error { - objectCopy := object.DeepCopyObject() - err := k.client.Status().Update(ctx, objectCopy) +func (k *Cluster) UpdateStatus(ctx context.Context, object client.Object) error { + err := k.client.Status().Update(ctx, object) if err != nil { if errors.IsInvalid(err) { // This is a Kubernetes bug that has been fixed in k8s 1.15 @@ -245,9 +240,8 @@ func (k *Cluster) UpdateStatus(ctx context.Context, object runtime.Object) error return nil } -func (k *Cluster) DeleteK8Object(ctx context.Context, object runtime.Object) error { - objDelete := object.DeepCopyObject() - err := k.client.Delete(ctx, objDelete) +func (k *Cluster) DeleteK8Object(ctx context.Context, object client.Object) error { + err := k.client.Delete(ctx, object) if err != nil { logger.Errorf(ctx, "K8s object delete failed %v", err) k.metrics.deleteFailure.Inc(ctx) diff --git a/pkg/controller/k8/mock/mock_k8.go b/pkg/controller/k8/mock/mock_k8.go index de383800..d62f99c0 100644 --- a/pkg/controller/k8/mock/mock_k8.go +++ b/pkg/controller/k8/mock/mock_k8.go @@ -2,19 +2,19 @@ package mock import ( "context" + "sigs.k8s.io/controller-runtime/pkg/client" v1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" ) type GetDeploymentsWithLabelFunc func(ctx context.Context, namespace string, labelMap map[string]string) (*v1.DeploymentList, error) -type CreateK8ObjectFunc func(ctx context.Context, object runtime.Object) error +type CreateK8ObjectFunc func(ctx context.Context, object client.Object) error type GetServiceFunc func(ctx context.Context, namespace string, name string, version string) (*corev1.Service, error) type GetServiceWithLabelFunc func(ctx context.Context, namespace string, labelMap map[string]string) (*corev1.ServiceList, error) -type UpdateK8ObjectFunc func(ctx context.Context, object runtime.Object) error -type UpdateStatusFunc func(ctx context.Context, object runtime.Object) error -type DeleteK8ObjectFunc func(ctx context.Context, object runtime.Object) error +type UpdateK8ObjectFunc func(ctx context.Context, object client.Object) error +type UpdateStatusFunc func(ctx context.Context, object client.Object) error +type DeleteK8ObjectFunc func(ctx context.Context, object client.Object) error type K8Cluster struct { GetDeploymentsWithLabelFunc GetDeploymentsWithLabelFunc @@ -47,28 +47,28 @@ func (m *K8Cluster) GetService(ctx context.Context, namespace string, name strin return nil, nil } -func (m *K8Cluster) CreateK8Object(ctx context.Context, object runtime.Object) error { +func (m *K8Cluster) CreateK8Object(ctx context.Context, object client.Object) error { if m.CreateK8ObjectFunc != nil { return m.CreateK8ObjectFunc(ctx, object) } return nil } -func (m *K8Cluster) UpdateK8Object(ctx context.Context, object runtime.Object) error { +func (m *K8Cluster) UpdateK8Object(ctx context.Context, object client.Object) error { if m.UpdateK8ObjectFunc != nil { return m.UpdateK8ObjectFunc(ctx, object) } return nil } -func (m *K8Cluster) UpdateStatus(ctx context.Context, object runtime.Object) error { +func (m *K8Cluster) UpdateStatus(ctx context.Context, object client.Object) error { if m.UpdateStatusFunc != nil { return m.UpdateStatusFunc(ctx, object) } return nil } -func (m *K8Cluster) DeleteK8Object(ctx context.Context, object runtime.Object) error { +func (m *K8Cluster) DeleteK8Object(ctx context.Context, object client.Object) error { if m.DeleteK8ObjectFunc != nil { return m.DeleteK8ObjectFunc(ctx, object) } From 1bafee3ec1619a99cbc021c2f6f80108b5f381ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leo=20Luo=F0=9F=98=BA?= Date: Thu, 20 Apr 2023 16:36:05 -0700 Subject: [PATCH 8/8] handle error returned by logger --- integ/blue_green_deployment_test.go | 35 ++++-- integ/checkpoint_failure_test.go | 31 ++++-- integ/job_cancellation_test.go | 51 +++++++-- integ/main_test.go | 10 +- integ/scaleup_test.go | 27 ++++- integ/simple_test.go | 105 ++++++++++++++---- integ/utils/utils.go | 10 +- .../flink/job_manager_controller_test.go | 16 +-- .../flink/task_manager_controller_test.go | 14 +-- 9 files changed, 220 insertions(+), 79 deletions(-) diff --git a/integ/blue_green_deployment_test.go b/integ/blue_green_deployment_test.go index e21a8e51..d4f59edf 100644 --- a/integ/blue_green_deployment_test.go +++ b/integ/blue_green_deployment_test.go @@ -11,7 +11,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), phase v1beta1.FlinkApplicationPhase, failurePhase v1beta1.FlinkApplicationPhase, ctx context.Context) *v1beta1.FlinkApplication { +func WaitForUpdate(ctx context.Context, c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), phase v1beta1.FlinkApplicationPhase, failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { // update with new image. app, err := s.Util.Update(ctx, name, updateFn) @@ -36,7 +36,10 @@ func WaitForUpdate(c *C, s *IntegSuite, name string, updateFn func(app *v1beta1. func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestUpdateWithBlueGreenDeploymentMode") + err := logger.Log("message", "Starting test TestUpdateWithBlueGreenDeploymentMode") + if err != nil { + return + } ctx := context.Background() testName := "bluegreenupdate" const finalizer = "bluegreen.finalizers.test.com" @@ -65,9 +68,9 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { } // test updating the app with a new image - newApp := WaitForUpdate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + newApp := WaitForUpdate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage - }, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed, ctx) + }, v1beta1.FlinkApplicationDualRunning, v1beta1.FlinkApplicationDeployFailed) c.Assert(newApp.Spec.Image, Equals, NewImage) c.Assert(newApp.Status.SavepointPath, NotNil) @@ -86,10 +89,13 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { teardownVersion := newApp.Status.DeployVersion hashToTeardown := newApp.Status.DeployHash oldHash := newApp.Status.DeployHash - logger.Log("message", "Tearing down version %s", teardownVersion) - newApp = WaitForUpdate(c, s, config.Name, func(app *v1beta1.FlinkApplication) { + logErr := logger.Log("message", "Tearing down version %s", teardownVersion) + if logErr != nil { + return + } + newApp = WaitForUpdate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.TearDownVersionHash = hashToTeardown - }, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed, ctx) + }, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed) // wait for the old cluster to be cleaned up for { @@ -120,7 +126,10 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { pods, err = s.Util.KubeClient.CoreV1().Pods(s.Util.Namespace.Name). List(ctx, v1.ListOptions{LabelSelector: "flink-app-hash=" + oldHash}) for _, pod := range pods.Items { - logger.Log("message", "Pod name %s", pod.Name) + err := logger.Log("message", "Pod name %s", pod.Name) + if err != nil { + return + } c.Assert(pod.Labels["flink-application-version"], Not(Equals), teardownVersion) } @@ -156,6 +165,12 @@ func (s *IntegSuite) TestUpdateWithBlueGreenDeploymentMode(c *C) { break } } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestUpdateWithBlueGreenDeploymentMode") + logErr = logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestUpdateWithBlueGreenDeploymentMode") + if logErr != nil { + return + } } diff --git a/integ/checkpoint_failure_test.go b/integ/checkpoint_failure_test.go index 98b4b492..33d6d0f8 100644 --- a/integ/checkpoint_failure_test.go +++ b/integ/checkpoint_failure_test.go @@ -11,7 +11,7 @@ import ( "time" ) -func failingJobTest(s *IntegSuite, c *C, ctx context.Context, testName string, causeFailure func(), logger log.Logger) { +func failingJobTest(ctx context.Context, s *IntegSuite, c *C, testName string, causeFailure func(), logger log.Logger) { // create a Flink app config, err := s.Util.ReadFlinkApplication("test_app.yaml") c.Assert(err, IsNil, Commentf("Failed to read test app yaml")) @@ -61,30 +61,45 @@ func failingJobTest(s *IntegSuite, c *C, ctx context.Context, testName string, c break } } - logger.Log("message", "All pods torn down") + logErr := logger.Log("message", "All pods torn down") + if logErr != nil { + return + } } // Tests that we correctly handle updating a job with task failures func (s *IntegSuite) TestJobWithTaskFailures(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestJobWithTaskFailures") + err := logger.Log("message", "Starting test TestJobWithTaskFailures") + if err != nil { + return + } ctx := context.Background() - failingJobTest(s, c, ctx, "taskfailure", func() { + failingJobTest(ctx, s, c, "taskfailure", func() { err := s.Util.ExecuteCommand("minikube", "ssh", "touch /tmp/checkpoints/fail && chmod 0644 /tmp/checkpoints/fail") c.Assert(err, IsNil) }, logger) - logger.Log("message", "Completed test TestJobWithTaskFailures") + err = logger.Log("message", "Completed test TestJobWithTaskFailures") + if err != nil { + return + } } // Tests that we correctly handle updating a job with a checkpoint timeout func (s *IntegSuite) TestCheckpointTimeout(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestCheckpointTimeout") + err := logger.Log("message", "Starting test TestCheckpointTimeout") + if err != nil { + return + } ctx := context.Background() - failingJobTest(s, c, ctx, "checkpointtimeout", func() { + failingJobTest(ctx, s, c, "checkpointtimeout", func() { // cause checkpoints to take 120 seconds err := s.Util.ExecuteCommand("minikube", "ssh", "echo 120000 >> /tmp/checkpoints/checkpoint_delay && sudo chmod 0644 /tmp/checkpoints/checkpoint_delay") c.Assert(err, IsNil) }, logger) - logger.Log("message", "Completed test TestCheckpointTimeout") + err = logger.Log("message", "Completed test TestCheckpointTimeout") + if err != nil { + return + } } diff --git a/integ/job_cancellation_test.go b/integ/job_cancellation_test.go index 0f1c1c54..bf5f51f6 100644 --- a/integ/job_cancellation_test.go +++ b/integ/job_cancellation_test.go @@ -11,7 +11,7 @@ import ( "time" ) -func WaitUpdateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { +func WaitUpdateAndValidate(ctx context.Context, c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase) *v1beta1.FlinkApplication { // update with new appln image. app, err := s.Util.Update(ctx, name, updateFn) @@ -60,7 +60,10 @@ func WaitUpdateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string // tests the workflow of job cancellation without savepoint func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestJobCancellationWithoutSavepoint") + err := logger.Log("message", "Starting test TestJobCancellationWithoutSavepoint") + if err != nil { + return + } ctx := context.Background() testName := "cancelsuccess" const finalizer = "simple.finalizers.test.com" @@ -90,7 +93,7 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { } // test updating the app with a new image - newApp := WaitUpdateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + newApp := WaitUpdateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }, v1beta1.FlinkApplicationDeployFailed) @@ -133,15 +136,24 @@ func (s *IntegSuite) TestJobCancellationWithoutSavepoint(c *C) { break } } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestJobCancellationWithoutSavepoint") + logErr := logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestJobCancellationWithoutSavepoint") + if logErr != nil { + return + } } // tests a job update with the existing job already in cancelled state. // here, the new submitted job starts without a savepoint. func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestCancelledJobWithoutSavepoint") + err := logger.Log("message", "Starting test TestCancelledJobWithoutSavepoint") + if err != nil { + return + } ctx := context.Background() testName := "invalidcancel" config, err := s.Util.ReadFlinkApplication("test_app.yaml") @@ -211,14 +223,23 @@ func (s *IntegSuite) TestCancelledJobWithoutSavepoint(c *C) { break } } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestCancelledJobWithoutSavepoint") + logErr := logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestCancelledJobWithoutSavepoint") + if logErr != nil { + return + } } // tests the recovery workflow of the job when savepoint is disabled. func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestJobRecoveryWithoutSavepoint") + logErr := logger.Log("message", "Starting test TestJobRecoveryWithoutSavepoint") + if logErr != nil { + return + } ctx := context.Background() const finalizer = "simple.finalizers.test.com" const testName = "cancelrecovery" @@ -267,7 +288,7 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { c.Assert(restored, IsNil) // roll forward with the right config. - _ = WaitUpdateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + _ = WaitUpdateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = config.Spec.JarName app.Spec.RestartNonce = "rollback2" app.Spec.Image = NewImage @@ -309,6 +330,12 @@ func (s *IntegSuite) TestJobRecoveryWithoutSavepoint(c *C) { } time.Sleep(100 * time.Millisecond) } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestJobRecoveryWithoutSavepoint") + logErr = logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestJobRecoveryWithoutSavepoint") + if logErr != nil { + return + } } diff --git a/integ/main_test.go b/integ/main_test.go index 0b8a469a..e81fc790 100644 --- a/integ/main_test.go +++ b/integ/main_test.go @@ -89,7 +89,10 @@ func (s *IntegSuite) SetUpSuite(c *C) { ProxyPort: flyteConfig.Port{Port: 8001}, } - logger.Log("message", "Running operator directly") + logErr := logger.Log("message", "Running operator directly") + if logErr != nil { + return + } go func() { if err = cmd.Run(&config); err != nil { @@ -123,7 +126,10 @@ func (s *IntegSuite) TearDownSuite(c *C) { logger := log.NewLogfmtLogger(os.Stdout) ctx := context.Background() if s != nil && s.Util != nil { - logger.Log("message", "Cleaning up") + logErr := logger.Log("message", "Cleaning up") + if logErr != nil { + return + } s.Util.Cleanup(ctx) } } diff --git a/integ/scaleup_test.go b/integ/scaleup_test.go index 3d27bf40..adf38478 100644 --- a/integ/scaleup_test.go +++ b/integ/scaleup_test.go @@ -16,7 +16,10 @@ import ( func (s *IntegSuite) TestInPlaceScaleUp(c *C) { ctx := context.Background() logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestInPlaceScaleUp") + logErr := logger.Log("message", "Starting test TestInPlaceScaleUp") + if logErr != nil { + return + } c.Skip("Skipping due to memory constraints in CI") const finalizer = "scaleup.finalizers.test.com" const testName = "test_in_place_scale_up" @@ -52,7 +55,10 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { c.Assert(len(deployments.Items), Equals, 1) deployment := deployments.Items[0] - logger.Log("message", "Application started successfully") + logErr = logger.Log("message", "Application started successfully") + if logErr != nil { + return + } // test updating the app with a new scale _, err = s.Util.Update(ctx, "inplace", func(app *v1beta1.FlinkApplication) { @@ -65,7 +71,10 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { c.Assert(s.Util.WaitForPhase(ctx, "inplace", v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(s.Util.WaitForAllTasksRunning(ctx, "inplace"), IsNil) - logger.Log("message", "Rescaled job started successfully") + logErr = logger.Log("message", "Rescaled job started successfully") + if logErr != nil { + return + } newApp, err := s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) @@ -95,7 +104,7 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { c.Assert(deployment2.Name, Equals, deployment.Name) // ensure that we can now proceed to a normal deployment - newApp = updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + newApp = updateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }, v1beta1.FlinkApplicationDeployFailed, logger) c.Assert(newApp.Spec.Image, Equals, NewImage) @@ -154,6 +163,12 @@ func (s *IntegSuite) TestInPlaceScaleUp(c *C) { } time.Sleep(100 * time.Millisecond) } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestInPlaceScaleUp") + logErr = logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestInPlaceScaleUp") + if logErr != nil { + return + } } diff --git a/integ/simple_test.go b/integ/simple_test.go index 74c63947..0a32ea9e 100644 --- a/integ/simple_test.go +++ b/integ/simple_test.go @@ -18,7 +18,7 @@ import ( const NewImage = "lyft/operator-test-app:b1b3cb8e8f98bd41f44f9c89f8462ce255e0d13f.2" -func updateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase, logger log.Logger) *v1beta1.FlinkApplication { +func updateAndValidate(ctx context.Context, c *C, s *IntegSuite, name string, updateFn func(app *v1beta1.FlinkApplication), failurePhase v1beta1.FlinkApplicationPhase, logger log.Logger) *v1beta1.FlinkApplication { app, err := s.Util.Update(ctx, name, updateFn) c.Assert(err, IsNil) @@ -31,7 +31,10 @@ func updateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, up c.Assert(err, IsNil) c.Assert(newApp.Status.JobStatus.JobID, Not(Equals), app.Status.JobStatus.JobID) - logger.Log("message", "New job started successfully") + logErr := logger.Log("message", "New job started successfully") + if logErr != nil { + return nil + } // check that we savepointed and restored correctly endpoint := fmt.Sprintf("jobs/%s/checkpoints", newApp.Status.JobStatus.JobID) @@ -71,7 +74,10 @@ func updateAndValidate(c *C, s *IntegSuite, ctx context.Context, name string, up // Tests job submission, upgrade, rollback, and deletion func (s *IntegSuite) TestSimple(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestSimple") + logErr := logger.Log("message", "Starting test TestSimple") + if logErr != nil { + return + } ctx := context.Background() const finalizer = "simple.finalizers.test.com" @@ -97,10 +103,13 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(pod.Spec.Containers[0].Image, Equals, config.Spec.Image) } - logger.Log("message", "Application started successfully") + logErr = logger.Log("message", "Application started successfully") + if logErr != nil { + return + } // test updating the app with a new image - newApp := updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + newApp := updateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage }, v1beta1.FlinkApplicationDeployFailed, logger) // check that the pods have the new image @@ -114,7 +123,7 @@ func (s *IntegSuite) TestSimple(c *C) { } // test updating the app with a config change - newApp = updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + newApp = updateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.FlinkConfig["akka.client.timeout"] = "23 s" }, v1beta1.FlinkApplicationDeployFailed, logger) // validate the config has been applied @@ -135,7 +144,10 @@ func (s *IntegSuite) TestSimple(c *C) { // Test updating the app with a bad jar name -- this should cause a failed deploy and roll back { - logger.Log("message", "Testing rollback") + logErr := logger.Log("message", "Testing rollback") + if logErr != nil { + return + } newApp, err := s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = "nonexistent.jar" // this shouldn't be needed after STRMCMP-473 is fixed @@ -148,7 +160,10 @@ func (s *IntegSuite) TestSimple(c *C) { // we should end up in the DeployFailed phase c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) - logger.Log("message", "Job is in deploy failed, waiting for tasks to start") + logErr = logger.Log("message", "Job is in deploy failed, waiting for tasks to start") + if logErr != nil { + return + } // but the job should have been resubmitted c.Assert(s.Util.WaitForAllTasksRunning(ctx, newApp.Name), IsNil) @@ -170,10 +185,13 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(restored.(map[string]interface{})["is_savepoint"], Equals, true) - logger.Log("message", "Attempting to roll forward") + logErr = logger.Log("message", "Attempting to roll forward") + if logErr != nil { + return + } // and we should be able to roll forward by resubmitting with a fixed config - updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + updateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.JarName = config.Spec.JarName app.Spec.RestartNonce = "rollback2" }, "", logger) @@ -182,7 +200,10 @@ func (s *IntegSuite) TestSimple(c *C) { // Test force rollback of an active deploy { - logger.Log("message", "Testing force rollback") + logErr := logger.Log("message", "Testing force rollback") + if logErr != nil { + return + } newApp, err := s.Util.Update(ctx, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = "lyft/badimage:latest" }) @@ -191,7 +212,10 @@ func (s *IntegSuite) TestSimple(c *C) { c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationClusterStarting, ""), IsNil) // User realizes error and cancels the deploy - logger.Log("message", "Cancelling deploy...") + logErr = logger.Log("message", "Cancelling deploy...") + if logErr != nil { + return + } newApp, err = s.Util.GetFlinkApplication(ctx, config.Name) c.Assert(err, IsNil) @@ -202,15 +226,21 @@ func (s *IntegSuite) TestSimple(c *C) { // we should end up in the DeployFailed phase c.Assert(s.Util.WaitForPhase(ctx, newApp.Name, v1beta1.FlinkApplicationDeployFailed, ""), IsNil) c.Assert(newApp.Spec.ForceRollback, Equals, true) - logger.Log("message", "User cancelled deploy. Job is in deploy failed, waiting for tasks to start") + logErr = logger.Log("message", "User cancelled deploy. Job is in deploy failed, waiting for tasks to start") + if logErr != nil { + return + } // but the job should still be running c.Assert(newApp.Status.JobStatus.State, Equals, v1beta1.Running) - logger.Log("message", "Attempting to roll forward with fix") + logErr = logger.Log("message", "Attempting to roll forward with fix") + if logErr != nil { + return + } // Fixing update // and we should be able to roll forward by resubmitting with a fixed config - updateAndValidate(c, s, ctx, config.Name, func(app *v1beta1.FlinkApplication) { + updateAndValidate(ctx, c, s, config.Name, func(app *v1beta1.FlinkApplication) { app.Spec.Image = NewImage app.Spec.RestartNonce = "rollback3" app.Spec.ForceRollback = false @@ -264,13 +294,22 @@ func (s *IntegSuite) TestSimple(c *C) { } time.Sleep(100 * time.Millisecond) } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestSimple") + logErr = logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestSimple") + if logErr != nil { + return + } } func (s *IntegSuite) TestRecovery(c *C) { logger := log.NewLogfmtLogger(os.Stdout) - logger.Log("message", "Starting test TestRecovery") + logErr := logger.Log("message", "Starting test TestRecovery") + if logErr != nil { + return + } ctx := context.Background() config, err := s.Util.ReadFlinkApplication("test_app.yaml") c.Assert(err, IsNil, Commentf("Failed to read test app yaml")) @@ -290,13 +329,19 @@ func (s *IntegSuite) TestRecovery(c *C) { c.Assert(s.Util.CreateFlinkApplication(ctx, config), IsNil, Commentf("Failed to create flink application")) - logger.Log("message", "Application Created") + logErr = logger.Log("message", "Application Created") + if logErr != nil { + return + } // wait for it to be running c.Assert(s.Util.WaitForPhase(ctx, config.Name, v1beta1.FlinkApplicationRunning, v1beta1.FlinkApplicationDeployFailed), IsNil) c.Assert(s.Util.WaitForAllTasksRunning(ctx, config.Name), IsNil) - logger.Log("message", "Application running") + logErr = logger.Log("message", "Application running") + if logErr != nil { + return + } // wait for checkpoints app, err := s.Util.GetFlinkApplication(ctx, config.Name) @@ -324,7 +369,10 @@ func (s *IntegSuite) TestRecovery(c *C) { err = s.Util.ExecuteCommand("minikube", "ssh", "touch /tmp/checkpoints/fail && chmod 0644 /tmp/checkpoints/fail") c.Assert(err, IsNil) - logger.Log("message", "Triggered failure") + logErr = logger.Log("message", "Triggered failure") + if logErr != nil { + return + } // wait a bit time.Sleep(1 * time.Second) @@ -335,7 +383,10 @@ func (s *IntegSuite) TestRecovery(c *C) { }) c.Assert(err, IsNil) - logger.Log("message", "Updated app") + logErr = logger.Log("message", "Updated app") + if logErr != nil { + return + } for { // wait until the new job is launched @@ -364,6 +415,12 @@ func (s *IntegSuite) TestRecovery(c *C) { break } } - logger.Log("message", "All pods torn down") - logger.Log("message", "Completed test TestRecovery") + logErr = logger.Log("message", "All pods torn down") + if logErr != nil { + return + } + logErr = logger.Log("message", "Completed test TestRecovery") + if logErr != nil { + return + } } diff --git a/integ/utils/utils.go b/integ/utils/utils.go index 031afafe..37e37354 100644 --- a/integ/utils/utils.go +++ b/integ/utils/utils.go @@ -388,14 +388,20 @@ func (f *TestUtil) TailOperatorLogs(ctx context.Context) error { if len(pods.Items) == 0 || len(pods.Items[0].Status.ContainerStatuses) == 0 || !pods.Items[0].Status.ContainerStatuses[0].Ready { time.Sleep(500 * time.Millisecond) - logger.Log("message", "Waiting for operator container to be ready...") + logErr := logger.Log("message", "Waiting for operator container to be ready...") + if logErr != nil { + return logErr + } } else { podName = pods.Items[0].Name break } } - logger.Log("message", "Found operator pod %s, starting to tail logs...", podName) + logErr := logger.Log("message", "Found operator pod %s, starting to tail logs...", podName) + if logErr != nil { + return logErr + } req := f.KubeClient.CoreV1().RESTClient().Get(). Namespace(f.Namespace.Name). diff --git a/pkg/controller/flink/job_manager_controller_test.go b/pkg/controller/flink/job_manager_controller_test.go index 5d3361fa..a97e7b72 100644 --- a/pkg/controller/flink/job_manager_controller_test.go +++ b/pkg/controller/flink/job_manager_controller_test.go @@ -1,6 +1,7 @@ package flink import ( + "sigs.k8s.io/controller-runtime/pkg/client" "testing" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -22,7 +23,6 @@ import ( coreV1 "k8s.io/api/core/v1" "k8s.io/api/networking/v1beta1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -82,7 +82,7 @@ func TestJobManagerCreateSuccess(t *testing.T) { } ctr := 0 mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ switch ctr { case 1: @@ -169,7 +169,7 @@ func TestJobManagerHACreateSuccess(t *testing.T) { } ctr := 0 mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ switch ctr { case 1: @@ -252,7 +252,7 @@ func TestJobManagerSecurityContextAssignment(t *testing.T) { ctr := 0 mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ switch ctr { case 1: @@ -278,7 +278,7 @@ func TestJobManagerCreateErr(t *testing.T) { testController := getJMControllerForTest() app := getFlinkTestApp() mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { return errors.New("create error") } newlyCreated, err := testController.CreateIfNotExist(context.Background(), &app) @@ -310,7 +310,7 @@ func TestJobManagerCreateAlreadyExists(t *testing.T) { } ctr := 0 - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ return k8sErrors.NewAlreadyExists(schema.GroupResource{}, "") } @@ -347,7 +347,7 @@ func TestJobManagerCreateNoIngress(t *testing.T) { } ctr := 0 - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ return k8sErrors.NewAlreadyExists(schema.GroupResource{}, "") } @@ -383,7 +383,7 @@ func TestJobManagerCreateSuccessWithVersion(t *testing.T) { } ctr := 0 mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { ctr++ switch ctr { case 1: diff --git a/pkg/controller/flink/task_manager_controller_test.go b/pkg/controller/flink/task_manager_controller_test.go index f23b60c2..fc889068 100644 --- a/pkg/controller/flink/task_manager_controller_test.go +++ b/pkg/controller/flink/task_manager_controller_test.go @@ -1,6 +1,7 @@ package flink import ( + "sigs.k8s.io/controller-runtime/pkg/client" "testing" k8mock "github.com/lyft/flinkk8soperator/pkg/controller/k8/mock" @@ -16,7 +17,6 @@ import ( v1 "k8s.io/api/apps/v1" coreV1 "k8s.io/api/core/v1" k8sErrors "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -85,7 +85,7 @@ func TestTaskManagerCreateSuccess(t *testing.T) { "flink-deployment-type": "taskmanager", } mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { deployment := object.(*v1.Deployment) assert.Equal(t, getTaskManagerName(&app, hash), deployment.Name) assert.Equal(t, app.Namespace, deployment.Namespace) @@ -136,7 +136,7 @@ func TestTaskManagerHACreateSuccess(t *testing.T) { "flink-deployment-type": "taskmanager", } mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { deployment := object.(*v1.Deployment) assert.Equal(t, getTaskManagerName(&app, hash), deployment.Name) assert.Equal(t, app.Namespace, deployment.Namespace) @@ -191,7 +191,7 @@ func TestTaskManagerSecurityContextAssignment(t *testing.T) { hash := "c06b960b" mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { deployment := object.(*v1.Deployment) assert.Equal(t, getTaskManagerName(&app, hash), deployment.Name) @@ -214,7 +214,7 @@ func TestTaskManagerCreateErr(t *testing.T) { testController := getTMControllerForTest() app := getFlinkTestApp() mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { return errors.New("create error") } newlyCreated, err := testController.CreateIfNotExist(context.Background(), &app) @@ -226,7 +226,7 @@ func TestTaskManagerCreateAlreadyExists(t *testing.T) { testController := getTMControllerForTest() app := getFlinkTestApp() mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { return k8sErrors.NewAlreadyExists(schema.GroupResource{}, "") } newlyCreated, err := testController.CreateIfNotExist(context.Background(), &app) @@ -259,7 +259,7 @@ func TestTaskManagerCreateSuccessWithVersion(t *testing.T) { "flink-application-version": testVersion, } mockK8Cluster := testController.k8Cluster.(*k8mock.K8Cluster) - mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object runtime.Object) error { + mockK8Cluster.CreateK8ObjectFunc = func(ctx context.Context, object client.Object) error { deployment := object.(*v1.Deployment) assert.Equal(t, getTaskManagerName(&app, hash), deployment.Name) assert.Equal(t, app.Namespace, deployment.Namespace)