From 72b675e72f51c4b2260fe9524746660c9f519091 Mon Sep 17 00:00:00 2001 From: Michael Fraenkel Date: Tue, 23 May 2023 09:13:55 -0600 Subject: [PATCH] PLAT-6517: Support k8s 1.26 (#139) - Regenerate CRDs - horizonalpodautoscaler is now autoscaling/v2 - updates to internal loggers - switch protobuf library --- .github/workflows/go.yml | 60 +- Dockerfile | 4 +- Makefile | 8 +- api/v1alpha1/daskcluster_webhook.go | 4 +- api/v1alpha1/mpicluster_webhook.go | 2 +- api/v1alpha1/raycluster_webhook.go | 6 +- .../raycluster_webhook_integration_test.go | 28 +- api/v1alpha1/sparkcluster_webhook.go | 4 +- .../sparkcluster_webhook_integration_test.go | 24 +- api/v1alpha1/validations.go | 2 +- ...ompute.dominodatalab.com_daskclusters.yaml | 1554 ++++++++++------- ...compute.dominodatalab.com_mpiclusters.yaml | 784 +++++---- ...compute.dominodatalab.com_rayclusters.yaml | 1554 ++++++++++------- ...mpute.dominodatalab.com_sparkclusters.yaml | 1554 ++++++++++------- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 2 - controllers/raycluster_controller.go | 19 +- .../raycluster_controller_integration_test.go | 14 +- controllers/sparkcluster_controller.go | 35 +- ...parkcluster_controller_integration_test.go | 10 +- controllers/suite_test.go | 5 +- controllers/variables.go | 2 +- go.mod | 166 +- go.sum | 694 +++----- pkg/cluster/dask/horizonalpodautoscaler.go | 38 +- .../dask/horizontalpodautoscaler_test.go | 38 +- pkg/cluster/dask/statefulset.go | 4 +- pkg/cluster/mpi/statefulset.go | 4 +- .../components/horizontalpodautoscaler.go | 6 +- pkg/controller/core/patch.go | 4 +- pkg/logging/logging.go | 52 - pkg/manager/manager.go | 5 +- pkg/resources/ray/helpers_test.go | 2 +- pkg/resources/ray/horizontalpodautoscaler.go | 38 +- .../ray/horizontalpodautoscaler_test.go | 38 +- pkg/resources/ray/service_test.go | 2 +- pkg/resources/ray/serviceaccount.go | 2 +- pkg/resources/ray/serviceaccount_test.go | 2 +- pkg/resources/ray/statefulset.go | 6 +- pkg/resources/ray/statefulset_test.go | 20 +- pkg/resources/spark/envoyfilter.go | 18 +- pkg/resources/spark/envoyfilter_test.go | 18 +- pkg/resources/spark/helpers_test.go | 2 +- .../spark/horizontalpodautoscaler.go | 38 +- .../spark/horizontalpodautoscaler_test.go | 38 +- pkg/resources/spark/serviceaccount.go | 2 +- pkg/resources/spark/serviceaccount_test.go | 2 +- pkg/resources/spark/statefulset.go | 10 +- pkg/resources/spark/statefulset_test.go | 26 +- 49 files changed, 3921 insertions(+), 3030 deletions(-) delete mode 100644 pkg/logging/logging.go diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 51d544a1..95234946 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -13,22 +13,12 @@ jobs: outputs: version: ${{ steps.docker_prep.outputs.version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.19.3 - - - name: Cache go modules and build data - uses: actions/cache@v3 - with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - key: ${{ runner.os }}-go119-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go119- + go-version: 1.20.3 - name: Cache build tools uses: actions/cache@v3 @@ -36,7 +26,7 @@ jobs: path: | bin testbin - key: ${{ runner.os }}-go119-${{ hashFiles('Makefile') }} + key: ${{ runner.os }}-go120-${{ hashFiles('Makefile') }} - name: Build run: make build @@ -48,20 +38,20 @@ jobs: run: make lint - name: Upload coverage report - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Github Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to Quay - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: quay.io username: ${{ secrets.QUAY_USERNAME }} @@ -96,19 +86,19 @@ jobs: TAGS_MPI_INIT="${VENDOR_IMAGE_MPI_INIT}:${VERSION}" TAGS_MPI_SYNC="${VENDOR_IMAGE_MPI_SYNC}:${VERSION}" - echo ::set-output name=description::${DESCRIPTION} - echo ::set-output name=image::${DOCKER_IMAGE} - echo ::set-output name=image_mpi_init::${DOCKER_IMAGE_MPI_INIT} - echo ::set-output name=image_mpi_sync::${DOCKER_IMAGE_MPI_SYNC} - echo ::set-output name=version::${VERSION} - echo ::set-output name=tags::${TAGS} - echo ::set-output name=tags_mpi_init::${TAGS_MPI_INIT} - echo ::set-output name=tags_mpi_sync::${TAGS_MPI_SYNC} - echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') + echo "description=${DESCRIPTION}" >> $GITHUB_OUTPUT + echo "image=${DOCKER_IMAGE}" >> $GITHUB_OUTPUT + echo "image_mpi_init=${DOCKER_IMAGE_MPI_INIT}" >> $GITHUB_OUTPUT + echo "image_mpi_sync=${DOCKER_IMAGE_MPI_SYNC}" >> $GITHUB_OUTPUT + echo "version=${VERSION}" >> $GITHUB_OUTPUT + echo "tags=${TAGS}" >> $GITHUB_OUTPUT + echo "tags_mpi_init=${TAGS_MPI_INIT}" >> $GITHUB_OUTPUT + echo "tags_mpi_sync=${TAGS_MPI_SYNC}" >> $GITHUB_OUTPUT + echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - name: Build and push Docker image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: push: true tags: ${{ steps.docker_prep.outputs.tags }} @@ -126,7 +116,7 @@ jobs: - name: Build and push Docker image for MPI init container id: docker_build_mpi_init - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:dockerfiles" file: mpi-init.Dockerfile @@ -144,7 +134,7 @@ jobs: - name: Build and push Docker image for MPI file sync container id: docker_build_mpi_sync - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:dockerfiles" file: mpi-sync.Dockerfile @@ -164,7 +154,7 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Helm run: | @@ -191,15 +181,15 @@ jobs: needs: build if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.19.3 + go-version: 1.20.3 - name: Publish Github release - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v4 with: args: release --rm-dist env: diff --git a/Dockerfile b/Dockerfile index 7c01dad0..1ff7c386 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.19.3 as builder +FROM golang:1.20.3 as builder WORKDIR /workspace # Copy the Go Modules manifests @@ -22,7 +22,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot +FROM gcr.io/distroless/static-debian11:nonroot WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/Makefile b/Makefile index e04e2160..6dd903d4 100644 --- a/Makefile +++ b/Makefile @@ -98,11 +98,11 @@ setup-envtest: ## Download setup-envtest locally if necessary. CONTROLLER_GEN = $(shell pwd)/bin/controller-gen controller-gen: ## Download controller-gen locally if necessary. - $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.3) KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: ## Download kustomize locally if necessary. - $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7) + $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.0.1) GOIMPORTS = $(shell pwd)/bin/goimports goimports: ## Download goimports locally if necessary. @@ -113,7 +113,7 @@ golangci-lint: ## Download golangci-lint locally if necessary. @[ -f $(GOLANGCI_LINT) ] || { \ set -e ;\ echo "Installing golangci-lint" ;\ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_DIR)/bin v1.50.1 ;\ + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_DIR)/bin v1.52.2 ;\ } HELM = $(shell pwd)/bin/helm @@ -123,7 +123,7 @@ helm: ## Download helm locally if necessary. echo "Installing helm" ;\ mkdir -p $(PROJECT_DIR)/bin ;\ export HELM_INSTALL_DIR=$(PROJECT_DIR)/bin ;\ - curl -sSfL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | $(SHELL) -s -- --no-sudo --version v3.9.3 ;\ + curl -sSfL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | $(SHELL) -s -- --no-sudo --version v3.11.2 ;\ } # go-get-tool will 'go get' any package $2 and install it to $1. diff --git a/api/v1alpha1/daskcluster_webhook.go b/api/v1alpha1/daskcluster_webhook.go index 7489063d..bd55ffbe 100644 --- a/api/v1alpha1/daskcluster_webhook.go +++ b/api/v1alpha1/daskcluster_webhook.go @@ -25,7 +25,7 @@ var ( } daskDefaultPodSecurityContext = &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(nobodyUID), + RunAsUser: pointer.Int64(nobodyUID), } daskDefaultImage = &OCIImageDefinition{ @@ -100,7 +100,7 @@ func (dc *DaskCluster) ValidateCreate() error { } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type -func (dc *DaskCluster) ValidateUpdate(old runtime.Object) error { +func (dc *DaskCluster) ValidateUpdate(_ runtime.Object) error { daskLogger.WithValues("daskcluster", client.ObjectKeyFromObject(dc)).Info("Validating update") return dc.validateDaskCluster() } diff --git a/api/v1alpha1/mpicluster_webhook.go b/api/v1alpha1/mpicluster_webhook.go index 907919d0..550d97aa 100644 --- a/api/v1alpha1/mpicluster_webhook.go +++ b/api/v1alpha1/mpicluster_webhook.go @@ -76,7 +76,7 @@ func (j *MPICluster) ValidateCreate() error { } // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type. -func (j *MPICluster) ValidateUpdate(old runtime.Object) error { +func (j *MPICluster) ValidateUpdate(_ runtime.Object) error { mpiClusterLogger.WithValues("mpicluster", client.ObjectKeyFromObject(j)).Info("Validating update") // TODO: reject all updates to spec, or certain fields? diff --git a/api/v1alpha1/raycluster_webhook.go b/api/v1alpha1/raycluster_webhook.go index 22fbb032..ac058280 100644 --- a/api/v1alpha1/raycluster_webhook.go +++ b/api/v1alpha1/raycluster_webhook.go @@ -20,9 +20,9 @@ var ( rayDefaultGCSServerPort int32 = 2386 rayDefaultDashboardPort int32 = 8265 rayDefaultRedisShardPorts = []int32{6380, 6381} - rayDefaultEnableDashboard = pointer.BoolPtr(true) - rayDefaultEnableNetworkPolicy = pointer.BoolPtr(true) - rayDefaultWorkerReplicas = pointer.Int32Ptr(1) + rayDefaultEnableDashboard = pointer.Bool(true) + rayDefaultEnableNetworkPolicy = pointer.Bool(true) + rayDefaultWorkerReplicas = pointer.Int32(1) rayDefaultNetworkPolicyPodLabels = map[string]string{ "ray-client": "true", } diff --git a/api/v1alpha1/raycluster_webhook_integration_test.go b/api/v1alpha1/raycluster_webhook_integration_test.go index 1b9c9237..6caed352 100644 --- a/api/v1alpha1/raycluster_webhook_integration_test.go +++ b/api/v1alpha1/raycluster_webhook_integration_test.go @@ -157,7 +157,7 @@ var _ = Describe("RayCluster", func() { It("does not enable the dashboard when false", func() { rc := rayFixture(testNS.Name) - rc.Spec.EnableDashboard = pointer.BoolPtr(false) + rc.Spec.EnableDashboard = pointer.Bool(false) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) Expect(rc.Spec.EnableDashboard).To(PointTo(Equal(false))) @@ -166,7 +166,7 @@ var _ = Describe("RayCluster", func() { Context("Network policies", func() { It("are not enabled when false", func() { rc := rayFixture(testNS.Name) - rc.Spec.NetworkPolicy.Enabled = pointer.BoolPtr(false) + rc.Spec.NetworkPolicy.Enabled = pointer.Bool(false) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) Expect(rc.Spec.NetworkPolicy.Enabled).To(PointTo(Equal(false))) @@ -202,14 +202,14 @@ var _ = Describe("RayCluster", func() { It("requires a positive worker replica count", func() { rc := rayFixture(testNS.Name) - rc.Spec.Worker.Replicas = pointer.Int32Ptr(-1) + rc.Spec.Worker.Replicas = pointer.Int32(-1) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) }) It("requires a minimum of 75MB for object store memory", func() { rc := rayFixture(testNS.Name) - rc.Spec.ObjectStoreMemoryBytes = pointer.Int64Ptr(74 * 1024 * 1024) + rc.Spec.ObjectStoreMemoryBytes = pointer.Int64(74 * 1024 * 1024) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) }) @@ -298,10 +298,10 @@ var _ = Describe("RayCluster", func() { It("requires min replicas to be > 0 when provided", func() { rc := clusterWithAutoscaling() - rc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(0) + rc.Spec.Autoscaling.MinReplicas = pointer.Int32(0) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) - rc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(1) + rc.Spec.Autoscaling.MinReplicas = pointer.Int32(1) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) }) @@ -315,11 +315,11 @@ var _ = Describe("RayCluster", func() { It("requires max replicas to be > min replicas", func() { rc := clusterWithAutoscaling() - rc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(2) + rc.Spec.Autoscaling.MinReplicas = pointer.Int32(2) rc.Spec.Autoscaling.MaxReplicas = 1 Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) - rc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(1) + rc.Spec.Autoscaling.MinReplicas = pointer.Int32(1) rc.Spec.Autoscaling.MaxReplicas = 2 Expect(k8sClient.Create(ctx, rc)).To(Succeed()) }) @@ -327,30 +327,30 @@ var _ = Describe("RayCluster", func() { It("requires average cpu utilization to be > 0", func() { rc := clusterWithAutoscaling() - rc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32Ptr(0) + rc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32(0) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) - rc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32Ptr(75) + rc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32(75) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) }) It("requires average memory utilization to be > 0", func() { rc := clusterWithAutoscaling() - rc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32Ptr(0) + rc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32(0) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) - rc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32Ptr(75) + rc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32(75) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) }) It("requires scale down stabilization to be >= 0 when provided", func() { rc := clusterWithAutoscaling() - rc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32Ptr(-1) + rc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32(-1) Expect(k8sClient.Create(ctx, rc)).ToNot(Succeed()) - rc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32Ptr(0) + rc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32(0) Expect(k8sClient.Create(ctx, rc)).To(Succeed()) }) }) diff --git a/api/v1alpha1/sparkcluster_webhook.go b/api/v1alpha1/sparkcluster_webhook.go index d6d75fb1..db40a82d 100644 --- a/api/v1alpha1/sparkcluster_webhook.go +++ b/api/v1alpha1/sparkcluster_webhook.go @@ -19,8 +19,8 @@ var ( sparkDefaultDriverUIPort int32 = 4040 sparkDefaultDriverPort int32 = 4041 sparkDefaultDriverBlockManagerPort int32 = 4042 - sparkDefaultEnableNetworkPolicy = pointer.BoolPtr(true) - sparkDefaultWorkerReplicas = pointer.Int32Ptr(1) + sparkDefaultEnableNetworkPolicy = pointer.Bool(true) + sparkDefaultWorkerReplicas = pointer.Int32(1) sparkDefaultNetworkPolicyClientPodLabels = map[string]string{ "spark-client": "true", } diff --git a/api/v1alpha1/sparkcluster_webhook_integration_test.go b/api/v1alpha1/sparkcluster_webhook_integration_test.go index cab92818..53b14f37 100644 --- a/api/v1alpha1/sparkcluster_webhook_integration_test.go +++ b/api/v1alpha1/sparkcluster_webhook_integration_test.go @@ -135,7 +135,7 @@ var _ = Describe("SparkCluster", func() { Context("Network policies", func() { It("are not enabled when false", func() { sc := sparkFixture(testNS.Name) - sc.Spec.NetworkPolicy.Enabled = pointer.BoolPtr(false) + sc.Spec.NetworkPolicy.Enabled = pointer.Bool(false) Expect(k8sClient.Create(ctx, sc)).To(Succeed()) Expect(sc.Spec.NetworkPolicy.Enabled).To(PointTo(Equal(false))) @@ -171,7 +171,7 @@ var _ = Describe("SparkCluster", func() { It("requires a positive worker replica count", func() { sc := sparkFixture(testNS.Name) - sc.Spec.Worker.Replicas = pointer.Int32Ptr(-10) + sc.Spec.Worker.Replicas = pointer.Int32(-10) Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) }) @@ -264,10 +264,10 @@ var _ = Describe("SparkCluster", func() { It("requires min replicas to be > 0 when provided", func() { sc := clusterWithAutoscaling() - sc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(0) + sc.Spec.Autoscaling.MinReplicas = pointer.Int32(0) Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) - sc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(1) + sc.Spec.Autoscaling.MinReplicas = pointer.Int32(1) Expect(k8sClient.Create(ctx, sc)).To(Succeed()) }) @@ -281,11 +281,11 @@ var _ = Describe("SparkCluster", func() { It("requires max replicas to be > min replicas", func() { sc := clusterWithAutoscaling() - sc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(2) + sc.Spec.Autoscaling.MinReplicas = pointer.Int32(2) sc.Spec.Autoscaling.MaxReplicas = 1 Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) - sc.Spec.Autoscaling.MinReplicas = pointer.Int32Ptr(1) + sc.Spec.Autoscaling.MinReplicas = pointer.Int32(1) sc.Spec.Autoscaling.MaxReplicas = 2 Expect(k8sClient.Create(ctx, sc)).To(Succeed()) }) @@ -293,30 +293,30 @@ var _ = Describe("SparkCluster", func() { It("requires average cpu utilization to be > 0", func() { sc := clusterWithAutoscaling() - sc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32Ptr(0) + sc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32(0) Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) - sc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32Ptr(75) + sc.Spec.Autoscaling.AverageCPUUtilization = pointer.Int32(75) Expect(k8sClient.Create(ctx, sc)).To(Succeed()) }) It("requires average memory utilization to be > 0", func() { sc := clusterWithAutoscaling() - sc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32Ptr(0) + sc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32(0) Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) - sc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32Ptr(75) + sc.Spec.Autoscaling.AverageMemoryUtilization = pointer.Int32(75) Expect(k8sClient.Create(ctx, sc)).To(Succeed()) }) It("requires scale down stabilization to be >= 0 when provided", func() { sc := clusterWithAutoscaling() - sc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32Ptr(-1) + sc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32(-1) Expect(k8sClient.Create(ctx, sc)).ToNot(Succeed()) - sc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32Ptr(0) + sc.Spec.Autoscaling.ScaleDownStabilizationWindowSeconds = pointer.Int32(0) Expect(k8sClient.Create(ctx, sc)).To(Succeed()) }) }) diff --git a/api/v1alpha1/validations.go b/api/v1alpha1/validations.go index c880e6aa..e5e9f18c 100644 --- a/api/v1alpha1/validations.go +++ b/api/v1alpha1/validations.go @@ -140,7 +140,7 @@ func validatePorts(portMap map[string]int32) field.ErrorList { var errs field.ErrorList fp := field.NewPath("spec") - ports := sets.Int32{} + ports := sets.Set[int32]{} for name, port := range portMap { if ports.Has(port) { errs = append(errs, field.Duplicate(fp.Child(name), port)) diff --git a/config/crd/bases/distributed-compute.dominodatalab.com_daskclusters.yaml b/config/crd/bases/distributed-compute.dominodatalab.com_daskclusters.yaml index 86bdb40b..7d357f39 100644 --- a/config/crd/bases/distributed-compute.dominodatalab.com_daskclusters.yaml +++ b/config/crd/bases/distributed-compute.dominodatalab.com_daskclusters.yaml @@ -1,10 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.11.3 creationTimestamp: null name: daskclusters.distributed-compute.dominodatalab.com spec: @@ -164,6 +163,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -179,6 +179,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' @@ -201,6 +202,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace properties: @@ -218,6 +220,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -256,6 +259,7 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic type: array istioMutualTLSMode: description: MutualTLSMode will be used to create a workload-specific @@ -491,6 +495,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -571,10 +576,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -630,6 +637,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -669,6 +677,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -741,6 +750,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -780,6 +790,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -851,6 +862,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -890,6 +902,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -962,6 +975,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -1001,6 +1015,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -1030,8 +1045,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -1077,6 +1092,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -1092,6 +1108,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -1115,6 +1132,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -1134,6 +1152,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -1158,6 +1177,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -1174,10 +1194,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -1191,8 +1212,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1247,8 +1267,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1272,8 +1291,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1328,8 +1346,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1353,8 +1370,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1369,6 +1385,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1504,8 +1536,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1520,6 +1551,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1613,6 +1660,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1749,8 +1814,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1765,6 +1829,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1954,6 +2034,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2127,14 +2224,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -2152,9 +2249,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -2168,14 +2267,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2198,8 +2320,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -2235,16 +2357,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2295,170 +2418,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -2469,25 +2595,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -2495,21 +2621,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -2540,6 +2667,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -2573,30 +2701,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -2612,16 +2741,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -2639,10 +2768,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -2656,15 +2786,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2688,8 +2840,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -2726,16 +2878,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2744,134 +2897,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -2879,67 +3035,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -2947,24 +3107,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -2972,94 +3132,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3071,13 +3230,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -3104,6 +3264,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -3142,35 +3303,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3182,26 +3345,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -3212,33 +3376,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -3246,97 +3410,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -3344,33 +3510,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -3378,61 +3545,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -3534,6 +3700,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -3614,10 +3781,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -3673,6 +3842,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3712,6 +3882,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3784,6 +3955,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3823,6 +3995,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3894,6 +4067,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3933,6 +4107,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4005,6 +4180,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -4044,6 +4220,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4073,8 +4250,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -4120,6 +4297,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -4135,6 +4313,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -4158,6 +4337,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -4177,6 +4357,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -4201,6 +4382,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -4217,10 +4399,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -4234,8 +4417,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4290,8 +4472,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4315,8 +4496,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4371,8 +4551,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4396,8 +4575,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4412,6 +4590,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4547,8 +4741,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4563,6 +4756,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4656,6 +4865,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -4792,8 +5019,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4808,6 +5034,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -5000,6 +5242,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5173,14 +5432,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -5198,9 +5457,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -5214,14 +5475,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5244,8 +5528,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -5281,16 +5565,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5341,170 +5626,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -5515,25 +5803,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -5541,21 +5829,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -5586,6 +5875,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -5619,30 +5909,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -5658,16 +5949,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -5685,10 +5976,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -5702,15 +5994,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5734,8 +6048,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -5772,16 +6086,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5790,134 +6105,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -5925,67 +6243,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -5993,24 +6315,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -6018,94 +6340,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6117,13 +6438,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -6150,6 +6472,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -6188,35 +6511,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6228,26 +6553,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -6258,33 +6584,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -6292,97 +6618,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -6390,33 +6718,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -6424,61 +6753,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -6532,9 +6860,3 @@ spec: specReplicasPath: .spec.worker.replicas statusReplicasPath: .status.workerReplicas status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/distributed-compute.dominodatalab.com_mpiclusters.yaml b/config/crd/bases/distributed-compute.dominodatalab.com_mpiclusters.yaml index ffb04f94..cfe4fdf2 100644 --- a/config/crd/bases/distributed-compute.dominodatalab.com_mpiclusters.yaml +++ b/config/crd/bases/distributed-compute.dominodatalab.com_mpiclusters.yaml @@ -1,10 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.11.3 creationTimestamp: null name: mpiclusters.distributed-compute.dominodatalab.com spec: @@ -134,6 +133,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -149,6 +149,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' @@ -171,6 +172,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace properties: @@ -188,6 +190,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -226,6 +229,7 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic type: array istioMutualTLSMode: description: MutualTLSMode will be used to create a workload-specific @@ -468,6 +472,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -548,10 +553,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -607,6 +614,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -646,6 +654,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -718,6 +727,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -757,6 +767,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -828,6 +839,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -867,6 +879,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -939,6 +952,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -978,6 +992,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -1014,8 +1029,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -1061,6 +1076,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -1076,6 +1092,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -1099,6 +1116,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -1118,6 +1136,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -1142,6 +1161,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -1158,10 +1178,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -1175,8 +1196,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1231,8 +1251,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1256,8 +1275,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1312,8 +1330,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1337,8 +1354,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1353,6 +1369,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1488,8 +1520,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1504,6 +1535,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1597,6 +1644,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1733,8 +1798,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1749,6 +1813,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1941,6 +2021,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2121,14 +2218,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -2146,9 +2243,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -2162,14 +2261,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2192,8 +2314,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -2229,16 +2351,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2289,170 +2412,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -2463,25 +2589,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -2489,21 +2615,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -2534,6 +2661,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -2567,30 +2695,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -2606,16 +2735,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -2633,10 +2762,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -2650,15 +2780,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2682,8 +2834,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -2720,16 +2872,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2738,134 +2891,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -2873,67 +3029,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -2941,24 +3101,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -2966,94 +3126,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3065,13 +3224,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -3098,6 +3258,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -3136,35 +3297,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3176,26 +3339,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -3206,33 +3370,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -3240,97 +3404,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -3338,33 +3504,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -3372,61 +3539,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -3483,9 +3649,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/distributed-compute.dominodatalab.com_rayclusters.yaml b/config/crd/bases/distributed-compute.dominodatalab.com_rayclusters.yaml index d77faa29..29d42d4c 100644 --- a/config/crd/bases/distributed-compute.dominodatalab.com_rayclusters.yaml +++ b/config/crd/bases/distributed-compute.dominodatalab.com_rayclusters.yaml @@ -1,10 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.11.3 creationTimestamp: null name: rayclusters.distributed-compute.dominodatalab.com spec: @@ -174,6 +173,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -189,6 +189,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' @@ -211,6 +212,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace properties: @@ -228,6 +230,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -321,6 +324,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -401,10 +405,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -460,6 +466,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -499,6 +506,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -571,6 +579,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -610,6 +619,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -681,6 +691,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -720,6 +731,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -792,6 +804,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -831,6 +844,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -860,8 +874,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -907,6 +921,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -922,6 +937,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -945,6 +961,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -964,6 +981,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -988,6 +1006,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -1004,10 +1023,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -1021,8 +1041,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1077,8 +1096,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1102,8 +1120,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1158,8 +1175,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1183,8 +1199,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1199,6 +1214,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1334,8 +1365,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1350,6 +1380,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1443,6 +1489,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1579,8 +1643,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1595,6 +1658,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1784,6 +1863,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1957,14 +2053,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -1982,9 +2078,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -1998,14 +2096,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2028,8 +2149,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -2065,16 +2186,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2125,170 +2247,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -2299,25 +2424,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -2325,21 +2450,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -2370,6 +2496,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -2403,30 +2530,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -2442,16 +2570,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -2469,10 +2597,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -2486,15 +2615,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2518,8 +2669,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -2556,16 +2707,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2574,134 +2726,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -2709,67 +2864,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -2777,24 +2936,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -2802,94 +2961,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -2901,13 +3059,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -2934,6 +3093,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -2972,35 +3132,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3012,26 +3174,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -3042,33 +3205,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -3076,97 +3239,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -3174,33 +3339,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -3208,61 +3374,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -3299,6 +3464,7 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic type: array istioMutualTLSMode: description: MutualTLSMode will be used to create a workload-specific @@ -3565,6 +3731,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -3645,10 +3812,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -3704,6 +3873,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3743,6 +3913,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3815,6 +3986,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3854,6 +4026,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3925,6 +4098,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3964,6 +4138,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4036,6 +4211,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -4075,6 +4251,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4104,8 +4281,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -4151,6 +4328,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -4166,6 +4344,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -4189,6 +4368,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -4208,6 +4388,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -4232,6 +4413,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -4248,10 +4430,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -4265,8 +4448,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4321,8 +4503,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4346,8 +4527,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4402,8 +4582,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4427,8 +4606,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4443,6 +4621,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4578,8 +4772,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4594,6 +4787,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4687,6 +4896,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -4823,8 +5050,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4839,6 +5065,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -5033,6 +5275,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5206,14 +5465,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -5231,9 +5490,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -5247,14 +5508,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5277,8 +5561,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -5314,16 +5598,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5374,170 +5659,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -5548,25 +5836,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -5574,21 +5862,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -5619,6 +5908,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -5652,30 +5942,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -5691,16 +5982,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -5718,10 +6009,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -5735,15 +6027,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5767,8 +6081,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -5805,16 +6119,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5823,134 +6138,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -5958,67 +6276,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -6026,24 +6348,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -6051,94 +6373,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6150,13 +6471,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -6183,6 +6505,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -6221,35 +6544,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6261,26 +6586,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -6291,33 +6617,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -6325,97 +6651,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -6423,33 +6751,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -6457,61 +6786,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -6570,9 +6898,3 @@ spec: specReplicasPath: .spec.worker.replicas statusReplicasPath: .status.workerReplicas status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/crd/bases/distributed-compute.dominodatalab.com_sparkclusters.yaml b/config/crd/bases/distributed-compute.dominodatalab.com_sparkclusters.yaml index e4594934..f7fcfaae 100644 --- a/config/crd/bases/distributed-compute.dominodatalab.com_sparkclusters.yaml +++ b/config/crd/bases/distributed-compute.dominodatalab.com_sparkclusters.yaml @@ -1,10 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.11.3 creationTimestamp: null name: sparkclusters.distributed-compute.dominodatalab.com spec: @@ -189,6 +188,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -204,6 +204,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' @@ -226,6 +227,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace properties: @@ -243,6 +245,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -287,6 +290,7 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic type: array istioMutualTLSMode: description: MutualTLSMode will be used to create a workload-specific @@ -383,6 +387,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -463,10 +468,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -522,6 +529,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -561,6 +569,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -633,6 +642,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -672,6 +682,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -743,6 +754,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -782,6 +794,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -854,6 +867,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -893,6 +907,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -928,8 +943,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -975,6 +990,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -990,6 +1006,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -1013,6 +1030,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -1032,6 +1050,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -1056,6 +1075,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -1072,10 +1092,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -1089,8 +1110,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1145,8 +1165,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1170,8 +1189,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -1226,8 +1244,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -1251,8 +1268,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1267,6 +1283,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1402,8 +1434,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1418,6 +1449,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1511,6 +1558,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -1647,8 +1712,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -1663,6 +1727,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -1852,6 +1932,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2025,14 +2122,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -2050,9 +2147,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -2066,14 +2165,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2096,8 +2218,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -2133,16 +2255,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2193,170 +2316,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -2367,25 +2493,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -2393,21 +2519,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -2438,6 +2565,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -2471,30 +2599,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -2510,16 +2639,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -2537,10 +2666,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -2554,15 +2684,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -2586,8 +2738,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -2624,16 +2776,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -2642,134 +2795,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -2777,67 +2933,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -2845,24 +3005,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -2870,94 +3030,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -2969,13 +3128,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -3002,6 +3162,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -3040,35 +3201,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -3080,26 +3243,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -3110,33 +3274,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -3144,97 +3308,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -3242,33 +3408,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -3276,61 +3443,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -3568,6 +3734,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. @@ -3648,10 +3815,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: description: Describes pod affinity scheduling rules (e.g. @@ -3707,6 +3876,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3746,6 +3916,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3818,6 +3989,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3857,6 +4029,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -3928,6 +4101,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -3967,6 +4141,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4039,6 +4214,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaceSelector: description: A label query over the set of namespaces that the term applies to. @@ -4078,6 +4254,7 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic namespaces: description: namespaces specifies a static list of namespace names that the term applies to. @@ -4113,8 +4290,8 @@ spec: run within a pod. properties: args: - description: Arguments to the entrypoint. The docker image's - CMD is used if this is not provided. + description: Arguments to the entrypoint. The container + image's CMD is used if this is not provided. items: type: string type: array @@ -4160,6 +4337,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.' @@ -4175,6 +4353,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, @@ -4198,6 +4377,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: description: Selects a key of a secret in the pod's namespace @@ -4217,6 +4397,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -4241,6 +4422,7 @@ spec: be defined type: boolean type: object + x-kubernetes-map-type: atomic prefix: description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. @@ -4257,10 +4439,11 @@ spec: defined type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: - description: 'Docker image name. More info: https://kubernetes.' + description: 'Container image name. More info: https://kubernetes.' type: string imagePullPolicy: description: Image pull policy. One of Always, Never, IfNotPresent. @@ -4274,8 +4457,7 @@ spec: container is created. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4330,8 +4512,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4355,8 +4536,7 @@ spec: e properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to @@ -4411,8 +4591,7 @@ spec: - port type: object tcpSocket: - description: TCPSocket specifies an action involving - a TCP port. + description: Deprecated. properties: host: description: 'Optional: Host name to connect @@ -4436,8 +4615,7 @@ spec: will be restarted if the probe fails. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4452,6 +4630,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4587,8 +4781,7 @@ spec: description: Periodic probe of container service readiness. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4603,6 +4796,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -4696,6 +4905,24 @@ spec: description: 'Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.' properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in + PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry + in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -4832,8 +5059,7 @@ spec: initialized. properties: exec: - description: One and only one of the following should - be specified. Exec specifies the action to take. + description: Exec specifies the action to take. properties: command: description: 'Command is the command line to execute @@ -4848,6 +5074,22 @@ spec: to be considered failed after having succeeded. format: int32 type: integer + grpc: + description: GRPC specifies an action involving a GRPC + port. + properties: + port: + description: Port number of the gRPC service. Number + must be in the range 1 to 65535. + format: int32 + type: integer + service: + description: Service is the name of the service + to place in the gRPC HealthCheckRequest (see https://github. + type: string + required: + - port + type: object httpGet: description: HTTPGet specifies the http request to perform. properties: @@ -5042,6 +5284,23 @@ spec: description: Resources are the requests and limits applied to cluster containers. properties: + claims: + description: Claims lists the names of resources, defined + in spec. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one entry in + pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5215,14 +5474,14 @@ spec: underlying claim. properties: accessModes: - description: 'AccessModes contains the desired access + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify either: - * An existing VolumeSnapshot object (snapshot.storage.k8s.' + description: 'dataSource field can be used to specify + either: * An existing VolumeSnapshot object (snapshot.' properties: apiGroup: description: APIGroup is the group for the resource @@ -5240,9 +5499,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which to populate - the volume with data, if a non-empty volume is desired. + description: dataSourceRef specifies the object from + which to populate the volume with data, if a non-empty + volum properties: apiGroup: description: APIGroup is the group for the resource @@ -5256,14 +5517,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace of resource + being referenced Note that when a namespace is + specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum resources - the volume should have. More info: https://kubernetes.' + description: resources represents the minimum resources + the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references one entry + in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name of one + entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5286,8 +5570,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over volumes + to consider for binding. properties: matchExpressions: description: matchExpressions is a list of label @@ -5323,16 +5607,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required by the - claim. More info: https://kubernetes.' + description: storageClassName is the name of the StorageClass + required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference to + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5383,170 +5668,173 @@ spec: may be accessed by any container in the pod. properties: awsElasticBlockStore: - description: AWSElasticBlockStore represents an AWS Disk + description: awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine an properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer readOnly: - description: Specify "true" to force and set the ReadOnly - property in VolumeMounts to "true". + description: 'readOnly value true will force the readOnly + setting in VolumeMounts. More info: https://kubernetes.' type: boolean volumeID: - description: 'Unique ID of the persistent disk resource - in AWS (Amazon EBS volume). More info: https://kubernetes.' + description: volumeID is unique ID of the persistent + disk resource in AWS (Amazon EBS volume). type: string required: - volumeID type: object azureDisk: - description: AzureDisk represents an Azure Data Disk mount + description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. properties: cachingMode: - description: 'Host Caching mode: None, Read Only, Read - Write.' + description: 'cachingMode is the Host Caching mode: + None, Read Only, Read Write.' type: string diskName: - description: The Name of the data disk in the blob storage + description: diskName is the Name of the data disk in + the blob storage type: string diskURI: - description: The URI the data disk in the blob storage + description: diskURI is the URI of data disk in the + blob storage type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is Filesystem type to mount. type: string kind: - description: 'Expected values Shared: multiple blob - disks per storage account Dedicated: single blob - disk per sto' + description: 'kind expected values are Shared: multiple + blob disks per storage account Dedicated: single + blob dis' type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean required: - diskName - diskURI type: object azureFile: - description: AzureFile represents an Azure File Service + description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. properties: readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretName: - description: the name of secret that contains Azure - Storage Account Name and Key + description: secretName is the name of secret that + contains Azure Storage Account Name and Key type: string shareName: - description: Share Name + description: shareName is the azure share Name type: string required: - secretName - shareName type: object cephfs: - description: CephFS represents a Ceph FS mount on the host + description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime properties: monitors: - description: 'Required: Monitors is a collection of - Ceph monitors More info: https://examples.k8s.' + description: 'monitors is Required: Monitors is a collection + of Ceph monitors More info: https://examples.k8s.' items: type: string type: array path: - description: 'Optional: Used as the mounted root, rather - than the full Ceph tree, default is /' + description: 'path is Optional: Used as the mounted + root, rather than the full Ceph tree, default is /' type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean secretFile: - description: 'Optional: SecretFile is the path to key - ring for User, default is /etc/ceph/user.' + description: 'secretFile is Optional: SecretFile is + the path to key ring for User, default is /etc/ceph/user.' type: string secretRef: - description: 'Optional: SecretRef is reference to the - authentication secret for User, default is empty.' + description: 'secretRef is Optional: SecretRef is reference + to the authentication secret for User, default is + empt' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'Optional: User is the rados user name, - default is admin More info: https://examples.k8s.' + description: 'user is optional: User is the rados user + name, default is admin More info: https://examples.k8s.' type: string required: - monitors type: object cinder: - description: Cinder represents a cinder volume attached + description: cinder represents a cinder volume attached and mounted on kubelets host machine. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. + description: fsType is the filesystem type to mount. type: string readOnly: - description: 'Optional: Defaults to false (read/write).' + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: 'Optional: points to a secret object containing - parameters used to connect to OpenStack.' + description: 'secretRef is optional: points to a secret + object containing parameters used to connect to OpenStack.' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeID: - description: 'volume id used to identify the volume - in cinder. More info: https://examples.k8s.' + description: 'volumeID used to identify the volume in + cinder. More info: https://examples.k8s.' type: string required: - volumeID type: object configMap: - description: ConfigMap represents a configMap that should + description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: 'If unspecified, each key-value pair in - the Data field of the referenced ConfigMap will be - projected ' + description: items if unspecified, each key-value pair + in the Data field of the referenced ConfigMap will + be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -5557,25 +5845,25 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap or its keys - must be defined + description: optional specify whether the ConfigMap + or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic csi: - description: CSI (Container Storage Interface) represents + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external C properties: driver: - description: Driver is the name of the CSI driver that + description: driver is the name of the CSI driver that handles this volume. type: string fsType: - description: Filesystem type to mount. Ex. "ext4", "xfs", - "ntfs". + description: fsType to mount. Ex. "ext4", "xfs", "ntfs". type: string nodePublishSecretRef: - description: NodePublishSecretRef is a reference to + description: nodePublishSecretRef is a reference to the secret object containing sensitive information to pass to properties: @@ -5583,21 +5871,22 @@ spec: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic readOnly: - description: Specifies a read-only configuration for - the volume. Defaults to false (read/write). + description: readOnly specifies a read-only configuration + for the volume. Defaults to false (read/write). type: boolean volumeAttributes: additionalProperties: type: string - description: VolumeAttributes stores driver-specific + description: volumeAttributes stores driver-specific properties that are passed to the CSI driver. type: object required: - driver type: object downwardAPI: - description: DownwardAPI represents downward API about the + description: downwardAPI represents downward API about the pod that should populate this volume properties: defaultMode: @@ -5628,6 +5917,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must be an octal value @@ -5661,30 +5951,31 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object emptyDir: - description: EmptyDir represents a temporary directory that + description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: What type of storage medium should back - this directory. + description: medium represents what type of storage + medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: Total amount of local storage required - for this EmptyDir volume. + description: sizeLimit is the total amount of local + storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object ephemeral: - description: Ephemeral represents a volume that is handled + description: ephemeral represents a volume that is handled by a cluster storage driver. properties: volumeClaimTemplate: @@ -5700,16 +5991,16 @@ spec: description: The specification for the PersistentVolumeClaim. properties: accessModes: - description: 'AccessModes contains the desired + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' items: type: string type: array dataSource: - description: 'This field can be used to specify - either: * An existing VolumeSnapshot object - (snapshot.storage.k8s.' + description: 'dataSource field can be used to + specify either: * An existing VolumeSnapshot + object (snapshot.' properties: apiGroup: description: APIGroup is the group for the @@ -5727,10 +6018,11 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: - description: Specifies the object from which - to populate the volume with data, if a non-empty - volume is desired. + description: dataSourceRef specifies the object + from which to populate the volume with data, + if a non-empty volum properties: apiGroup: description: APIGroup is the group for the @@ -5744,15 +6036,37 @@ spec: description: Name is the name of resource being referenced type: string + namespace: + description: Namespace is the namespace + of resource being referenced Note that + when a namespace is specified, a g + type: string required: - kind - name type: object resources: - description: 'Resources represents the minimum - resources the volume should have. More info: - https://kubernetes.' + description: resources represents the minimum + resources the volume should have. properties: + claims: + description: Claims lists the names of resources, + defined in spec. + items: + description: ResourceClaim references + one entry in PodSpec.ResourceClaims. + properties: + name: + description: Name must match the name + of one entry in pod.spec. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -5776,8 +6090,8 @@ spec: type: object type: object selector: - description: A label query over volumes to consider - for binding. + description: selector is a label query over + volumes to consider for binding. properties: matchExpressions: description: matchExpressions is a list @@ -5814,16 +6128,17 @@ spec: pairs. type: object type: object + x-kubernetes-map-type: atomic storageClassName: - description: 'Name of the StorageClass required - by the claim. More info: https://kubernetes.' + description: storageClassName is the name of + the StorageClass required by the claim. type: string volumeMode: description: volumeMode defines what type of volume is required by the claim. type: string volumeName: - description: VolumeName is the binding reference + description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object @@ -5832,134 +6147,137 @@ spec: type: object type: object fc: - description: FC represents a Fibre Channel resource that + description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string lun: - description: 'Optional: FC target lun number' + description: 'lun is Optional: FC target lun number' format: int32 type: integer readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: Defaults to false + (read/write).' type: boolean targetWWNs: - description: 'Optional: FC target worldwide names (WWNs)' + description: 'targetWWNs is Optional: FC target worldwide + names (WWNs)' items: type: string type: array wwids: - description: 'Optional: FC volume world wide identifiers + description: 'wwids Optional: FC volume world wide identifiers (wwids) Either wwids or combination of targetWWNs - and lun' + a' items: type: string type: array type: object flexVolume: - description: FlexVolume represents a generic volume resource + description: flexVolume represents a generic volume resource that is provisioned/attached using an exec based plu properties: driver: - description: Driver is the name of the driver to use + description: driver is the name of the driver to use for this volume. type: string fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string options: additionalProperties: type: string - description: 'Optional: Extra command options if any.' + description: 'options is Optional: this field holds + extra command options if any.' type: object readOnly: - description: 'Optional: Defaults to false (read/write).' + description: 'readOnly is Optional: defaults to false + (read/write).' type: boolean secretRef: - description: 'Optional: SecretRef is reference to the - secret object containing sensitive information to - pass to th' + description: 'secretRef is Optional: secretRef is reference + to the secret object containing sensitive information ' properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object flocker: - description: Flocker represents a Flocker volume attached + description: flocker represents a Flocker volume attached to a kubelet's host machine. properties: datasetName: - description: Name of the dataset stored as metadata - -> name on the dataset for Flocker should be considered - as de + description: datasetName is Name of the dataset stored + as metadata -> name on the dataset for Flocker should + be c type: string datasetUUID: - description: UUID of the dataset. This is unique identifier - of a Flocker dataset + description: datasetUUID is the UUID of the dataset. + This is unique identifier of a Flocker dataset type: string type: object gcePersistentDisk: - description: GCEPersistentDisk represents a GCE Disk resource + description: gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and th properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is filesystem type of the volume + that you want to mount. type: string partition: - description: The partition in the volume that you want - to mount. + description: partition is the partition in the volume + that you want to mount. format: int32 type: integer pdName: - description: Unique name of the PD resource in GCE. - Used to identify the disk in GCE. + description: pdName is unique name of the PD resource + in GCE. Used to identify the disk in GCE. type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean required: - pdName type: object gitRepo: - description: 'GitRepo represents a git repository at a particular + description: 'gitRepo represents a git repository at a particular revision. DEPRECATED: GitRepo is deprecated.' properties: directory: - description: Target directory name. Must not contain - or start with '..'. If '. + description: directory is the target directory name. + Must not contain or start with '..'. If '. type: string repository: - description: Repository URL + description: repository is the URL type: string revision: - description: Commit hash for the specified revision. + description: revision is the commit hash for the specified + revision. type: string required: - repository type: object glusterfs: - description: Glusterfs represents a Glusterfs mount on the + description: glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. properties: endpoints: - description: 'EndpointsName is the endpoint name that - details Glusterfs topology. More info: https://examples.k8s.' + description: 'endpoints is the endpoint name that details + Glusterfs topology. More info: https://examples.k8s.' type: string path: - description: 'Path is the Glusterfs volume path. More + description: 'path is the Glusterfs volume path. More info: https://examples.k8s.io/volumes/glusterfs/README.' type: string readOnly: - description: ReadOnly here will force the Glusterfs + description: readOnly here will force the Glusterfs volume to be mounted with read-only permissions. type: boolean required: @@ -5967,67 +6285,71 @@ spec: - path type: object hostPath: - description: HostPath represents a pre-existing file or + description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: Path of the directory on the host. + description: path of the directory on the host. type: string type: - description: 'Type for HostPath Volume Defaults to "" + description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object iscsi: - description: ISCSI represents an ISCSI Disk resource that + description: iscsi represents an ISCSI Disk resource that is attached to a kubelet's host machine and then expose properties: chapAuthDiscovery: - description: whether support iSCSI Discovery CHAP authentication + description: chapAuthDiscovery defines whether support + iSCSI Discovery CHAP authentication type: boolean chapAuthSession: - description: whether support iSCSI Session CHAP authentication + description: chapAuthSession defines whether support + iSCSI Session CHAP authentication type: boolean fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string initiatorName: - description: Custom iSCSI Initiator Name. + description: initiatorName is the custom iSCSI Initiator + Name. type: string iqn: - description: Target iSCSI Qualified Name. + description: iqn is the target iSCSI Qualified Name. type: string iscsiInterface: - description: iSCSI Interface Name that uses an iSCSI - transport. Defaults to 'default' (tcp). + description: iscsiInterface is the interface Name that + uses an iSCSI transport. Defaults to 'default' (tcp). type: string lun: - description: iSCSI Target Lun number. + description: lun represents iSCSI Target Lun number. format: int32 type: integer portals: - description: iSCSI Target Portal List. + description: portals is the iSCSI Target Portal List. items: type: string type: array readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: CHAP Secret for iSCSI target and initiator - authentication + description: secretRef is the CHAP Secret for iSCSI + target and initiator authentication properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic targetPortal: - description: iSCSI Target Portal. + description: targetPortal is iSCSI Target Portal. type: string required: - iqn @@ -6035,24 +6357,24 @@ spec: - targetPortal type: object name: - description: 'Volume''s name. Must be a DNS_LABEL and unique - within the pod. More info: https://kubernetes.' + description: 'name of the volume. Must be a DNS_LABEL and + unique within the pod. More info: https://kubernetes.' type: string nfs: - description: 'NFS represents an NFS mount on the host that + description: 'nfs represents an NFS mount on the host that shares a pod''s lifetime More info: https://kubernetes.' properties: path: - description: 'Path that is exported by the NFS server. + description: 'path that is exported by the NFS server. More info: https://kubernetes.' type: string readOnly: - description: ReadOnly here will force the NFS export + description: readOnly here will force the NFS export to be mounted with read-only permissions. Defaults to false. type: boolean server: - description: 'Server is the hostname or IP address of + description: 'server is the hostname or IP address of the NFS server. More info: https://kubernetes.' type: string required: @@ -6060,94 +6382,93 @@ spec: - server type: object persistentVolumeClaim: - description: PersistentVolumeClaimVolumeSource represents + description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: ClaimName is the name of a PersistentVolumeClaim + description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: Will force the ReadOnly setting in VolumeMounts. - Default false. + description: readOnly Will force the ReadOnly setting + in VolumeMounts. Default false. type: boolean required: - claimName type: object photonPersistentDisk: - description: 'PhotonPersistentDisk represents a PhotonController + description: 'photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets ' properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string pdID: - description: ID that identifies Photon Controller persistent - disk + description: pdID is the ID that identifies Photon Controller + persistent disk type: string required: - pdID type: object portworxVolume: - description: PortworxVolume represents a portworx volume + description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine properties: fsType: - description: FSType represents the filesystem type to + description: fSType represents the filesystem type to mount Must be a filesystem type supported by the host opera type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean volumeID: - description: VolumeID uniquely identifies a Portworx + description: volumeID uniquely identifies a Portworx volume type: string required: - volumeID type: object projected: - description: Items for all in one resources secrets, configmaps, - and downward API + description: projected items for all in one resources secrets, + configmaps, and downward API properties: defaultMode: - description: Mode bits used to set permissions on created - files by default. + description: defaultMode are the mode bits used to set + permissions on created files by default. format: int32 type: integer sources: - description: list of volume projections + description: sources is the list of volume projections items: description: Projection that may be projected along with other supported volume types properties: configMap: - description: information about the configMap data - to project + description: configMap information about the configMap + data to project properties: items: - description: 'If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - ConfigMap will be projected ' + ConfigMap will be proj items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6159,13 +6480,14 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the ConfigMap - or its keys must be defined + description: optional specify whether the + ConfigMap or its keys must be defined type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: - description: information about the downwardAPI - data to project + description: downwardAPI information about the + downwardAPI data to project properties: items: description: Items is a list of DownwardAPIVolume @@ -6192,6 +6514,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: description: 'Optional: mode bits used to set permissions on this file, must @@ -6230,35 +6553,37 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object type: array type: object secret: - description: information about the secret data - to project + description: secret information about the secret + data to project properties: items: - description: If unspecified, each key-value + description: items if unspecified, each key-value pair in the Data field of the referenced - Secret will be projected int + Secret will be project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used - to set permissions on this file.' + description: 'mode is Optional: mode + bits used to set permissions on this + file.' format: int32 type: integer path: - description: The relative path of the - file to map the key to. May not be - an absolute path. + description: path is the relative path + of the file to map the key to. May + not be an absolute path. type: string required: - key @@ -6270,26 +6595,27 @@ spec: https://kubernetes.' type: string optional: - description: Specify whether the Secret or - its key must be defined + description: optional field specify whether + the Secret or its key must be defined type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: - description: information about the serviceAccountToken - data to project + description: serviceAccountToken is information + about the serviceAccountToken data to project properties: audience: - description: Audience is the intended audience + description: audience is the intended audience of the token. type: string expirationSeconds: - description: ExpirationSeconds is the requested + description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: Path is the path relative to + description: path is the path relative to the mount point of the file to project the token into. type: string @@ -6300,33 +6626,33 @@ spec: type: array type: object quobyte: - description: Quobyte represents a Quobyte mount on the host + description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime properties: group: - description: Group to map volume access to Default is + description: group to map volume access to Default is no group type: string readOnly: - description: ReadOnly here will force the Quobyte volume + description: readOnly here will force the Quobyte volume to be mounted with read-only permissions. type: boolean registry: - description: Registry represents a single or multiple + description: registry represents a single or multiple Quobyte Registry services specified as a string as host:por type: string tenant: - description: Tenant owning the given Quobyte volume + description: tenant owning the given Quobyte volume in the Backend Used with dynamically provisioned Quobyte volu type: string user: - description: User to map volume access to Defaults to + description: user to map volume access to Defaults to serivceaccount user type: string volume: - description: Volume is a string that references an already + description: volume is a string that references an already created Quobyte volume by name. type: string required: @@ -6334,97 +6660,99 @@ spec: - volume type: object rbd: - description: RBD represents a Rados Block Device mount on + description: rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. properties: fsType: - description: Filesystem type of the volume that you - want to mount. + description: fsType is the filesystem type of the volume + that you want to mount. type: string image: - description: 'The rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it' + description: 'image is the rados image name. More info: + https://examples.k8s.io/volumes/rbd/README.' type: string keyring: - description: Keyring is the path to key ring for RBDUser. + description: keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. type: string monitors: - description: 'A collection of Ceph monitors. More info: - https://examples.k8s.io/volumes/rbd/README.' + description: 'monitors is a collection of Ceph monitors. + More info: https://examples.k8s.io/volumes/rbd/README.' items: type: string type: array pool: - description: 'The rados pool name. Default is rbd. More - info: https://examples.k8s.io/volumes/rbd/README.' + description: 'pool is the rados pool name. Default is + rbd. More info: https://examples.k8s.io/volumes/rbd/README.' type: string readOnly: - description: ReadOnly here will force the ReadOnly setting + description: readOnly here will force the ReadOnly setting in VolumeMounts. Defaults to false. type: boolean secretRef: - description: SecretRef is name of the authentication + description: secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic user: - description: 'The rados user name. Default is admin. - More info: https://examples.k8s.io/volumes/rbd/README.' + description: 'user is the rados user name. Default is + admin. More info: https://examples.k8s.' type: string required: - image - monitors type: object scaleIO: - description: ScaleIO represents a ScaleIO persistent volume + description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string gateway: - description: The host address of the ScaleIO API Gateway. + description: gateway is the host address of the ScaleIO + API Gateway. type: string protectionDomain: - description: The name of the ScaleIO Protection Domain - for the configured storage. + description: protectionDomain is the name of the ScaleIO + Protection Domain for the configured storage. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly Defaults to false (read/write). type: boolean secretRef: - description: SecretRef references to the secret for + description: secretRef references to the secret for ScaleIO user and other sensitive information. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic sslEnabled: - description: Flag to enable/disable SSL communication + description: sslEnabled Flag enable/disable SSL communication with Gateway, default false type: boolean storageMode: - description: Indicates whether the storage for a volume - should be ThickProvisioned or ThinProvisioned. + description: storageMode indicates whether the storage + for a volume should be ThickProvisioned or ThinProvisioned type: string storagePool: - description: The ScaleIO Storage Pool associated with - the protection domain. + description: storagePool is the ScaleIO Storage Pool + associated with the protection domain. type: string system: - description: The name of the storage system as configured - in ScaleIO. + description: system is the name of the storage system + as configured in ScaleIO. type: string volumeName: - description: The name of a volume already created in - the ScaleIO system that is associated with this volume - sourc + description: volumeName is the name of a volume already + created in the ScaleIO system that is associated with + thi type: string required: - gateway @@ -6432,33 +6760,34 @@ spec: - system type: object secret: - description: 'Secret represents a secret that should populate + description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'Optional: mode bits used to set permissions - on created files by default.' + description: 'defaultMode is Optional: mode bits used + to set permissions on created files by default.' format: int32 type: integer items: - description: If unspecified, each key-value pair in - the Data field of the referenced Secret will be projected - int + description: items If unspecified, each key-value pair + in the Data field of the referenced Secret will be + project items: description: Maps a string key to a path within a volume. properties: key: - description: The key to project. + description: key is the key to project. type: string mode: - description: 'Optional: mode bits used to set - permissions on this file.' + description: 'mode is Optional: mode bits used + to set permissions on this file.' format: int32 type: integer path: - description: The relative path of the file to - map the key to. May not be an absolute path. + description: path is the relative path of the + file to map the key to. May not be an absolute + path. type: string required: - key @@ -6466,61 +6795,60 @@ spec: type: object type: array optional: - description: Specify whether the Secret or its keys - must be defined + description: optional field specify whether the Secret + or its keys must be defined type: boolean secretName: - description: 'Name of the secret in the pod''s namespace - to use. More info: https://kubernetes.' + description: 'secretName is the name of the secret in + the pod''s namespace to use. More info: https://kubernetes.' type: string type: object storageos: - description: StorageOS represents a StorageOS volume attached + description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is the filesystem type to mount. type: string readOnly: - description: Defaults to false (read/write). ReadOnly - here will force the ReadOnly setting in VolumeMounts. + description: readOnly defaults to false (read/write). type: boolean secretRef: - description: SecretRef specifies the secret to use for + description: secretRef specifies the secret to use for obtaining the StorageOS API credentials. properties: name: description: 'Name of the referent. More info: https://kubernetes.' type: string type: object + x-kubernetes-map-type: atomic volumeName: - description: VolumeName is the human-readable name of + description: volumeName is the human-readable name of the StorageOS volume. type: string volumeNamespace: - description: VolumeNamespace specifies the scope of + description: volumeNamespace specifies the scope of the volume within StorageOS. type: string type: object vsphereVolume: - description: VsphereVolume represents a vSphere volume attached + description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine properties: fsType: - description: Filesystem type to mount. Must be a filesystem - type supported by the host operating system. Ex. + description: fsType is filesystem type to mount. type: string storagePolicyID: - description: Storage Policy Based Management (SPBM) - profile ID associated with the StoragePolicyName. + description: storagePolicyID is the storage Policy Based + Management (SPBM) profile ID associated with the Storage type: string storagePolicyName: - description: Storage Policy Based Management (SPBM) - profile name. + description: storagePolicyName is the storage Policy + Based Management (SPBM) profile name. type: string volumePath: - description: Path that identifies vSphere volume vmdk + description: volumePath is the path that identifies + vSphere volume vmdk type: string required: - volumePath @@ -6584,9 +6912,3 @@ spec: specReplicasPath: .spec.worker.replicas statusReplicasPath: .status.workerReplicas status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index fffdadf4..78a5b981 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -1,4 +1,3 @@ - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index fd439a28..5cf04ab7 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -1,4 +1,3 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration @@ -90,7 +89,6 @@ webhooks: resources: - sparkclusters sideEffects: None - --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration diff --git a/controllers/raycluster_controller.go b/controllers/raycluster_controller.go index 490f6be1..20c65f5f 100644 --- a/controllers/raycluster_controller.go +++ b/controllers/raycluster_controller.go @@ -11,6 +11,7 @@ import ( "github.com/dominodatalab/distributed-compute-operator/pkg/controller/components" + "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" corev1 "k8s.io/api/core/v1" @@ -30,7 +31,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" dcv1alpha1 "github.com/dominodatalab/distributed-compute-operator/api/v1alpha1" - "github.com/dominodatalab/distributed-compute-operator/pkg/logging" "github.com/dominodatalab/distributed-compute-operator/pkg/resources/istio" "github.com/dominodatalab/distributed-compute-operator/pkg/resources/ray" "github.com/dominodatalab/distributed-compute-operator/pkg/util" @@ -39,7 +39,7 @@ import ( // RayClusterReconciler reconciles RayCluster objects. type RayClusterReconciler struct { client.Client - Log logging.ContextLogger + Log logr.Logger Scheme *runtime.Scheme IstioEnabled bool } @@ -70,7 +70,8 @@ func (r *RayClusterReconciler) SetupWithManager(mgr ctrl.Manager) error { // Reconcile implements state reconciliation logic for RayCluster objects. func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { - ctx, log := r.Log.NewContext(ctx, "raycluster", req.NamespacedName) + log := r.Log.WithValues("raycluster", req.NamespacedName) + ctx = logr.NewContext(ctx, log) log.V(2).Info("reconciliation loop triggered") @@ -113,7 +114,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) // absent and remove it during a delete request after performing the required // finalization steps. func (r *RayClusterReconciler) manageFinalization(ctx context.Context, rc *dcv1alpha1.RayCluster) (bool, error) { - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) registered := controllerutil.ContainsFinalizer(rc, DistributedComputeFinalizer) if rc.GetDeletionTimestamp().IsZero() && !registered { @@ -432,7 +433,7 @@ func (r *RayClusterReconciler) createOrUpdateOwnedResource(ctx context.Context, } gvk := gvks[0] - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) found := controlled.DeepCopyObject().(client.Object) if err = r.Get(ctx, client.ObjectKeyFromObject(controlled), found); err != nil { @@ -473,7 +474,7 @@ func (r *RayClusterReconciler) createOrUpdateOwnedResource(ctx context.Context, // deleteIfExists will delete one or more Kubernetes objects if they exist. func (r *RayClusterReconciler) deleteIfExists(ctx context.Context, objs ...client.Object) error { - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) for _, obj := range objs { if err := r.Get(ctx, client.ObjectKeyFromObject(obj), obj); err != nil { @@ -535,7 +536,7 @@ func (r *RayClusterReconciler) modifyStatusNodes(ctx context.Context, rc *dcv1al return false, nil } - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) log.V(1).Info("modifying status", "path", ".status.nodes", "value", podNames) rc.Status.Nodes = podNames @@ -560,7 +561,7 @@ func (r *RayClusterReconciler) modifyStatusWorkerFields(ctx context.Context, rc return false, err } - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) var modified bool if rc.Status.WorkerSelector != selector.String() { @@ -583,7 +584,7 @@ func (r *RayClusterReconciler) modifyStatusWorkerFields(ctx context.Context, rc // a cluster instance using selector labels. this should find all the claims // created by both the head and worker stateful sets. func (r *RayClusterReconciler) deleteExternalStorage(ctx context.Context, rc *dcv1alpha1.RayCluster) error { - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) ns := rc.Namespace labels := ray.SelectorLabels(rc) diff --git a/controllers/raycluster_controller_integration_test.go b/controllers/raycluster_controller_integration_test.go index 32822e39..1e76163f 100644 --- a/controllers/raycluster_controller_integration_test.go +++ b/controllers/raycluster_controller_integration_test.go @@ -67,8 +67,8 @@ var _ = Describe("RayCluster Controller", func() { Kind: reflect.TypeOf(*cluster).Name(), Name: cluster.Name, UID: cluster.UID, - Controller: pointer.BoolPtr(true), - BlockOwnerDeletion: pointer.BoolPtr(true), + Controller: pointer.Bool(true), + BlockOwnerDeletion: pointer.Bool(true), })) } @@ -207,19 +207,19 @@ func createCluster(ctx context.Context, name string) (client.ObjectKey, *dcv1alp Tag: "bar", }, NetworkPolicy: dcv1alpha1.NetworkPolicyConfig{ - Enabled: pointer.BoolPtr(true), + Enabled: pointer.Bool(true), }, PodSecurityPolicy: psp.Name, }, Autoscaling: &dcv1alpha1.Autoscaling{ - MinReplicas: pointer.Int32Ptr(1), + MinReplicas: pointer.Int32(1), MaxReplicas: 1, - AverageCPUUtilization: pointer.Int32Ptr(50), - AverageMemoryUtilization: pointer.Int32Ptr(50), + AverageCPUUtilization: pointer.Int32(50), + AverageMemoryUtilization: pointer.Int32(50), }, }, Worker: dcv1alpha1.RayClusterWorker{ - Replicas: pointer.Int32Ptr(1), + Replicas: pointer.Int32(1), }, Port: 6379, ClientServerPort: 10001, diff --git a/controllers/sparkcluster_controller.go b/controllers/sparkcluster_controller.go index b98c53ef..5ede5169 100644 --- a/controllers/sparkcluster_controller.go +++ b/controllers/sparkcluster_controller.go @@ -32,7 +32,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" dcv1alpha1 "github.com/dominodatalab/distributed-compute-operator/api/v1alpha1" - "github.com/dominodatalab/distributed-compute-operator/pkg/logging" "github.com/dominodatalab/distributed-compute-operator/pkg/resources/istio" "github.com/dominodatalab/distributed-compute-operator/pkg/resources/spark" "github.com/dominodatalab/distributed-compute-operator/pkg/util" @@ -45,13 +44,13 @@ var ( // SparkPatchAnnotator applies state annotations to owned components. SparkPatchAnnotator = patch.NewAnnotator(SparkLastAppliedConfig) // SparkPatchMaker calculates changes to state annotations on owned components. - SparkPatchMaker = patch.NewPatchMaker(SparkPatchAnnotator) + SparkPatchMaker = patch.NewPatchMaker(SparkPatchAnnotator, &patch.K8sStrategicMergePatcher{}, &patch.BaseJSONMergePatcher{}) ) // SparkClusterReconciler reconciles SparkCluster objects. type SparkClusterReconciler struct { client.Client - Log logging.ContextLogger + Log logr.Logger Scheme *runtime.Scheme IstioEnabled bool } @@ -86,7 +85,8 @@ const SparkFinalizerName = "distributed-compute.dominodatalab.com/dco-finalizer" // Reconcile implements state reconciliation logic for SparkCluster objects. func (r *SparkClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { - ctx, log := r.setLogger(ctx, r.Log.WithValues("sparkcluster", req.NamespacedName)) + log := r.Log.WithValues("sparkcluster", req.NamespacedName) + ctx = logr.NewContext(ctx, log) log.V(2).Info("reconciliation loop triggered") @@ -473,7 +473,7 @@ func (r *SparkClusterReconciler) reconcileStatefulSets(ctx context.Context, sc * return err } - log := r.getLogger(ctx) + log := logr.FromContextOrDiscard(ctx) // update autoscaling fields var updateStatus bool @@ -527,7 +527,7 @@ func (r *SparkClusterReconciler) getMasterPod(ctx context.Context, sc *dcv1alpha pods := &corev1.PodList{} err := r.List(ctx, pods, opts...) if err != nil && !apierrors.IsNotFound(err) { - r.getLogger(ctx).V(1).Error(err, "reading master status") + logr.FromContextOrDiscard(ctx).V(1).Error(err, "reading master status") } if len(pods.Items) == 0 { return corev1.Pod{}, false @@ -555,7 +555,7 @@ func (r *SparkClusterReconciler) createOrUpdateOwnedResource(ctx context.Context } gvk := gvks[0] - log := r.Log.FromContext(ctx) + log := logr.FromContextOrDiscard(ctx) found := controlled.DeepCopyObject().(client.Object) if err = r.Get(ctx, client.ObjectKeyFromObject(controlled), found); err != nil { @@ -596,7 +596,7 @@ func (r *SparkClusterReconciler) createOrUpdateOwnedResource(ctx context.Context // deleteIfExists will delete one or more Kubernetes objects if they exist. func (r *SparkClusterReconciler) deleteIfExists(ctx context.Context, objs ...client.Object) error { - log := r.getLogger(ctx) + log := logr.FromContextOrDiscard(ctx) for _, obj := range objs { err := r.Get(ctx, client.ObjectKeyFromObject(obj), obj) @@ -645,22 +645,3 @@ func (r *SparkClusterReconciler) updateStatus(ctx context.Context, sc *dcv1alpha return nil } - -type loggerKeyType int - -const loggerKey loggerKeyType = iota - -func (r *SparkClusterReconciler) setLogger(ctx context.Context, logger logr.Logger) (context.Context, logr.Logger) { - return context.WithValue(ctx, loggerKey, logger), logger -} - -func (r *SparkClusterReconciler) getLogger(ctx context.Context) logr.Logger { - if ctx == nil { - return r.Log - } - if ctxLogger, ok := ctx.Value(loggerKey).(logr.Logger); ok { - return ctxLogger - } - - return r.Log -} diff --git a/controllers/sparkcluster_controller_integration_test.go b/controllers/sparkcluster_controller_integration_test.go index 4d9707d6..3a8f15dc 100644 --- a/controllers/sparkcluster_controller_integration_test.go +++ b/controllers/sparkcluster_controller_integration_test.go @@ -178,7 +178,7 @@ func createAndBasicTest(ctx context.Context, name string) { Tag: "bar", }, NetworkPolicy: dcv1alpha1.NetworkPolicyConfig{ - Enabled: pointer.BoolPtr(true), + Enabled: pointer.Bool(true), ClientLabels: map[string]string{"app.kubernetes.io/instance": "spark-driver"}, }, KerberosKeytab: &dcv1alpha1.KerberosKeytabConfig{ @@ -188,10 +188,10 @@ func createAndBasicTest(ctx context.Context, name string) { PodSecurityPolicy: psp.Name, }, Autoscaling: &dcv1alpha1.Autoscaling{ - MinReplicas: pointer.Int32Ptr(1), + MinReplicas: pointer.Int32(1), MaxReplicas: 1, - AverageCPUUtilization: pointer.Int32Ptr(50), - AverageMemoryUtilization: pointer.Int32Ptr(50), + AverageCPUUtilization: pointer.Int32(50), + AverageMemoryUtilization: pointer.Int32(50), }, }, Master: dcv1alpha1.SparkClusterNode{ @@ -205,7 +205,7 @@ func createAndBasicTest(ctx context.Context, name string) { "w1": "v1", }, }, - Replicas: pointer.Int32Ptr(1), + Replicas: pointer.Int32(1), }, ClusterPort: 7077, MasterWebPort: 80, diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 1f392c37..1bf58d1c 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -16,7 +16,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" dcv1alpha1 "github.com/dominodatalab/distributed-compute-operator/api/v1alpha1" - "github.com/dominodatalab/distributed-compute-operator/pkg/logging" // +kubebuilder:scaffold:imports ) @@ -72,7 +71,7 @@ var _ = BeforeSuite(func() { err = (&RayClusterReconciler{ Client: k8sClient, Scheme: k8sManager.GetScheme(), - Log: logging.New(ctrl.Log.WithName("controllers").WithName("RayCluster")), + Log: ctrl.Log.WithName("controllers").WithName("RayCluster"), IstioEnabled: false, }).SetupWithManager(k8sManager) Expect(err).ToNot(HaveOccurred()) @@ -80,7 +79,7 @@ var _ = BeforeSuite(func() { err = (&SparkClusterReconciler{ Client: k8sClient, Scheme: k8sManager.GetScheme(), - Log: logging.New(ctrl.Log.WithName("controllers").WithName("SparkCluster")), + Log: ctrl.Log.WithName("controllers").WithName("SparkCluster"), IstioEnabled: false, }).SetupWithManager(k8sManager) Expect(err).ToNot(HaveOccurred()) diff --git a/controllers/variables.go b/controllers/variables.go index ace50279..34e32ca8 100644 --- a/controllers/variables.go +++ b/controllers/variables.go @@ -16,7 +16,7 @@ var ( // PatchAnnotator applies state annotations to owned components. PatchAnnotator = patch.NewAnnotator(path.Join(dcv1alpha1.GroupVersion.Group, "last-applied")) // PatchMaker calculates changes to state annotations on owned components. - PatchMaker = patch.NewPatchMaker(PatchAnnotator) + PatchMaker = patch.NewPatchMaker(PatchAnnotator, &patch.K8sStrategicMergePatcher{}, &patch.BaseJSONMergePatcher{}) // PatchCalculateOpts define the exclusion rules used when calculating the // difference between two k8s resources. PatchCalculateOpts = []patch.CalculateOption{ diff --git a/go.mod b/go.mod index a1eccc47..9a171e91 100644 --- a/go.mod +++ b/go.mod @@ -1,110 +1,110 @@ module github.com/dominodatalab/distributed-compute-operator -go 1.19 +go 1.20 require ( - github.com/banzaicloud/k8s-objectmatcher v1.5.1 - github.com/docker/distribution v2.7.1+incompatible - github.com/go-logr/logr v0.4.0 + github.com/banzaicloud/k8s-objectmatcher v1.8.0 + github.com/docker/distribution v2.8.1+incompatible + github.com/go-logr/logr v1.2.4 github.com/gogo/protobuf v1.3.2 - github.com/hashicorp/go-retryablehttp v0.6.8 + github.com/hashicorp/go-retryablehttp v0.7.2 github.com/onsi/ginkgo v1.16.4 - github.com/onsi/gomega v1.15.0 + github.com/onsi/gomega v1.24.1 github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/spf13/cobra v1.1.3 - github.com/stretchr/testify v1.7.0 - google.golang.org/grpc v1.39.1 // indirect - istio.io/api v0.0.0-20210713195055-3a340e4f154e - istio.io/client-go v1.10.3 - k8s.io/api v0.22.1 - k8s.io/apiextensions-apiserver v0.22.1 - k8s.io/apimachinery v0.22.1 - k8s.io/apiserver v0.22.1 - k8s.io/client-go v0.22.1 - k8s.io/utils v0.0.0-20210802155522-efc7438f0176 - sigs.k8s.io/controller-runtime v0.10.0 - sigs.k8s.io/yaml v1.2.0 + github.com/spf13/cobra v1.7.0 + github.com/stretchr/testify v1.8.2 + google.golang.org/grpc v1.54.0 // indirect + istio.io/api v0.0.0-20230410230800-a94614182296 + istio.io/client-go v1.17.1 + k8s.io/api v0.26.3 + k8s.io/apiextensions-apiserver v0.26.3 + k8s.io/apimachinery v0.26.3 + k8s.io/apiserver v0.26.3 + k8s.io/client-go v0.26.3 + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + sigs.k8s.io/controller-runtime v0.14.6 + sigs.k8s.io/yaml v1.3.0 ) require ( - cloud.google.com/go v0.54.0 // indirect - emperror.dev/errors v0.8.0 // indirect - github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.18 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect - github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect - github.com/Azure/go-autorest/logger v0.2.1 // indirect - github.com/Azure/go-autorest/tracing v0.6.0 // indirect + emperror.dev/errors v0.8.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver v3.5.1+incompatible // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cenkalti/backoff/v4 v4.2.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/coreos/go-semver v0.3.1 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/evanphx/json-patch v4.11.0+incompatible // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/go-logr/zapr v0.4.0 // indirect + github.com/emicklei/go-restful/v3 v3.10.2 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-logr/zapr v1.2.3 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // 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.5 // 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/golang/protobuf v1.5.3 // indirect + github.com/google/gnostic v0.6.9 // indirect + github.com/google/go-cmp v0.5.9 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.1 // indirect - github.com/imdario/mergo v0.3.12 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/imdario/mergo v0.3.15 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mailru/easyjson v0.7.7 // 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.11.0 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.26.0 // indirect - github.com/prometheus/procfs v0.6.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.9.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.etcd.io/etcd/api/v3 v3.5.0 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect - go.etcd.io/etcd/client/v3 v3.5.0 // indirect - go.opentelemetry.io/contrib v0.20.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect - go.opentelemetry.io/otel v0.20.0 // indirect - go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect - go.opentelemetry.io/otel/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk v0.20.0 // indirect - go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect - go.opentelemetry.io/otel/trace v0.20.0 // indirect - go.opentelemetry.io/proto/otlp v0.7.0 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect - golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect - golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect - golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect - golang.org/x/text v0.3.6 // indirect - golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + go.etcd.io/etcd/api/v3 v3.5.7 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect + go.etcd.io/etcd/client/v3 v3.5.7 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect + go.opentelemetry.io/otel/metric v0.37.0 // indirect + go.opentelemetry.io/otel/sdk v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect + go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.24.0 // indirect + golang.org/x/net v0.9.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/term v0.7.0 // indirect + golang.org/x/text v0.9.0 // indirect + golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect - google.golang.org/protobuf v1.26.0 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f // indirect - k8s.io/component-base v0.22.1 // indirect - k8s.io/klog/v2 v2.9.0 // indirect - k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/component-base v0.26.3 // indirect + k8s.io/klog/v2 v2.90.1 // indirect + k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/go.sum b/go.sum index 92b4e730..2d70b214 100644 --- a/go.sum +++ b/go.sum @@ -8,182 +8,141 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= 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 v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= 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/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= 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= -emperror.dev/errors v0.8.0 h1:4lycVEx0sdJkwDUfQ9pdu6SR0x7rgympt5f4+ok8jDk= emperror.dev/errors v0.8.0/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE= -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 v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= -github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= -github.com/Azure/go-autorest/autorest/adal v0.9.13 h1:Mp5hbtOePIzM8pJVRa3YLrWWmZtoxRXqUEzCfJt3+/Q= -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 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0= +emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE= 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.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -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/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/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-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/banzaicloud/k8s-objectmatcher v1.5.1 h1:u3Ic1JzIUQe0pGGjVQJvCWTNa+t9CiW49IPPovYqAss= -github.com/banzaicloud/k8s-objectmatcher v1.5.1/go.mod h1:9MWY5HsM/OaTmoTirczhlO8UALbH722WgdpaaR7Y8OE= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/banzaicloud/k8s-objectmatcher v1.8.0 h1:Nugn25elKtPMTA2br+JgHNeSQ04sc05MDPmpJnd1N2A= +github.com/banzaicloud/k8s-objectmatcher v1.8.0/go.mod h1:p2LSNAjlECf07fbhDyebTkPUIYnU05G+WfGgkTmgeMg= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -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.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= +github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= +github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= 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 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= 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.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/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/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -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.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -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/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +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/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 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/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= +github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= 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 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= 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/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= +github.com/emicklei/go-restful/v3 v3.10.2/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/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= -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/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= +github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= -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 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +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 v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= 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-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.4.0 h1:uc1uML3hRYL9/ZZPdgHS/n8Nzo+eaYL/Efxkkamf7OM= -github.com/go-logr/zapr v0.4.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.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -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-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= 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= @@ -194,11 +153,14 @@ 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= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -208,136 +170,95 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD 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/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= +github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= 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.2/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 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.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.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/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -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 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= 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 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 h1:gDLXvp5S9izjldquuoAhDzccbskOL6tDC5jMSyx3zxE= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -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-retryablehttp v0.6.8 h1:92lWxgpa+fF3FozM4B3UZtHZMJX8T5XT+TFdCxsPyWs= -github.com/hashicorp/go-retryablehttp v0.6.8/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -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.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0= +github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -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= -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 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= +github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= 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 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= -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 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= 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/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/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/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= 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/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-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/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -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/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/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/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/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +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/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= @@ -346,186 +267,129 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb 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 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= 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/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/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.11.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/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.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/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/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= +github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -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/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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 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.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_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_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-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/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/procfs v0.0.0-20181005140218-185b4288413d/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= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +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.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= 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/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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= 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/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= -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/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/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= -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.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.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 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= -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 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd/api/v3 v3.5.0 h1:GsV3S+OfZEOCNXdtNkBSR7kgLobAa/SO6tCxRa0GAYw= -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 h1:2aQv6F436YnN7I4VbI8PPYrBhu+SmrTaADcf8Mi/6PU= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0 h1:ftQ0nOOHMcbMS3KIaDQ0g5Qcd6bhaBrQT6b89DfwLTs= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v3 v3.5.0 h1:62Eh0XOro+rDwkrypAGDfgmNh5Joq+z+W9HZdlXMzek= -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 h1:ntrg6vvKRW26JRmHTE0iNlDgYK6JX3hg/4cD62X0ixk= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0 h1:kw2TmO3yFTgE+F0mdKkG7xMxkit2duBDa2Hu6D/HMlw= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0 h1:jk8D/lwGEDlQU9kZXUFMSANkE22Sg5+mW27ip8xcF9E= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= +go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY= +go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA= +go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg= +go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY= +go.etcd.io/etcd/client/v2 v2.305.5 h1:DktRP60//JJpnPC0VBymAN/7V71GHMdjDCBt4ZPXDjI= +go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4= +go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw= +go.etcd.io/etcd/pkg/v3 v3.5.5 h1:Ablg7T7OkR+AeeeU32kdVhw/AGDsitkKPl7aW73ssjU= +go.etcd.io/etcd/raft/v3 v3.5.5 h1:Ibz6XyZ60OYyRopu73lLM/P+qco3YtlZMOhnXNS051I= +go.etcd.io/etcd/server/v3 v3.5.5 h1:jNjYm/9s+f9A9r6+SC4RvNaz6AqixpOvhrFdT0PvIj0= 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.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= -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 h1:sO4WKdPAudZGKPcpZT4MJn6JaDmpyLrMPDGGyA1SttE= -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 h1:Q3C9yzW6I9jqEc8sawxzxZmY48fs9u220KXq6d5s3XU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.20.0 h1:4kzhXFP+btKm4jwxpjIqjs41A7MakRFUS86bqLHTIw8= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0 h1:HiITxCawalo5vQzdHfKeZurV8x7ljcqAgiWzF6Vaeaw= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0 h1:JsxtGXd06J8jrnya7fdI/U/MR6yXA5DtbZy+qoHQlr8= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0 h1:c5VRjxCXdQlx1HjzwGdQHzZaVI82b5EbBgOu2ljD92g= -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 h1:7ao1wpzHRVKf0OQ7GIxiQJA6X7DLX9o14gmVon7mMK8= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0 h1:1DL6EXUdcg95gukhuRRvLDO/4X5THh/5dIV52lqtnbw= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 h1:5jD3teb4Qh7mx/nfzq4jO2WFFpvXD0vYWFDrdvNWmXk= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 h1:lE9EJyw3/JhrjWH/hEy9FptnalDQgj7vpbgC2KCCCxE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0/go.mod h1:pcQ3MM3SWvrA71U4GDqv9UFDJ3HQsW7y5ZO3tDTlUdI= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 h1:/fXHZHGvro6MVqV34fJzDhi7sHGpX3Ej/Qjmfn003ho= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0/go.mod h1:UFG7EBMRdXyFstOwH028U0sVf+AvukSGhF0g8+dmNG8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 h1:TKf2uAs2ueguzLaxOCBXNpHxfO/aC7PAdDsSH0IbeRQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0/go.mod h1:HrbCVv40OOLTABmOn1ZWty6CHXkU8DK/Urc43tHug70= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 h1:ap+y8RXX3Mu9apKVtOkM6WSFESLM8K3wNQyOU8sWHcc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0/go.mod h1:5w41DY6S9gZrbjuq6Y+753e96WfPha5IcsOSZTtullM= +go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs= +go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s= +go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= +go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -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.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= +go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -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/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -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.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= 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-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +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-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-20190611184440-5c40567a22f8/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.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -548,8 +412,6 @@ 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= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -558,14 +420,9 @@ 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/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-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= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -573,10 +430,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-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-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= @@ -584,57 +440,52 @@ 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-20201110031124-69a78807bb2b/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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 h1:ADo5wSpq2gqaCGQWzk7S5vd//0iyyLeAratkEoG5dLE= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= 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= -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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-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-20190616124812-15dcb6c0061f/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-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= @@ -642,46 +493,39 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w 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-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/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-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/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-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= -golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/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 h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +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-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= @@ -690,20 +534,16 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/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= @@ -718,17 +558,23 @@ 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-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-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 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= @@ -741,12 +587,19 @@ 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-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -766,13 +619,23 @@ 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-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-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-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +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-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= 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= @@ -781,14 +644,16 @@ 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.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= 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/grpc v1.39.1 h1:f37vZbBVTiJ6jKG5mWz8ySOBxNqy6ViPgyhSdVnxF3E= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= 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= @@ -800,97 +665,82 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-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/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= 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/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -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.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 h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -istio.io/api v0.0.0-20210713195055-3a340e4f154e h1:bO5I6D2fmcjbZDRMyWOR+1XwjhMoDXlsj4VMLrZ3IMI= -istio.io/api v0.0.0-20210713195055-3a340e4f154e/go.mod h1:nsSFw1LIMmGL7r/+6fJI6FxeG/UGlLxRK8bkojIvBVs= -istio.io/client-go v1.10.3 h1:DX63v1cEgQWF+fFkU+804AwesFdyLBnwGmcWsRRTthE= -istio.io/client-go v1.10.3/go.mod h1:O80GUkeDEZ2eXmIsQ+sx31eCRApKtUxJuPv2dFi0SSc= -istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f h1:9710FpGLvIJ1GGEbpuTh1smVBv+r8cJfR3G82ouSxIQ= -istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f/go.mod h1:6BwTZRNbWS570wHX/uR1Wqk5e0157TofTAUMzT7N4+s= -k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= -k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= -k8s.io/api v0.22.1 h1:ISu3tD/jRhYfSW8jI/Q1e+lRxkR7w9UwQEZ7FgslrwY= -k8s.io/api v0.22.1/go.mod h1:bh13rkTp3F1XEaLGykbyRD2QaTTzPm0e/BMd8ptFONY= -k8s.io/apiextensions-apiserver v0.22.1 h1:YSJYzlFNFSfUle+yeEXX0lSQyLEoxoPJySRupepb0gE= -k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMsghwS8XTUYb2c= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +istio.io/api v0.0.0-20230410230800-a94614182296 h1:ZpBwDPGZZ16Vq3YYYtRg6dR7pbmSl0c2wA91kEQRHqg= +istio.io/api v0.0.0-20230410230800-a94614182296/go.mod h1:q3bvmBQjuI+OKNn9693bhGq3Pk+rECjfs3OpPWInHY0= +istio.io/client-go v1.17.1 h1:W0kQXYCzIluA/20zLzxeNF7bNMJXXArmGYRt/MIg2io= +istio.io/client-go v1.17.1/go.mod h1:mLTRYYFxHctzUbt8Iclgj+Sueq34+qC2ZEJTn6BxRuE= +k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU= +k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE= +k8s.io/apiextensions-apiserver v0.26.3 h1:5PGMm3oEzdB1W/FTMgGIDmm100vn7IaUP5er36dB+YE= +k8s.io/apiextensions-apiserver v0.26.3/go.mod h1:jdA5MdjNWGP+njw1EKMZc64xAT5fIhN6VJrElV3sfpQ= k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.22.1 h1:DTARnyzmdHMz7bFWFDDm22AM4pLWTQECMpRTFu2d2OM= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apiserver v0.22.1 h1:Ul9Iv8OMB2s45h2tl5XWPpAZo1VPIJ/6N+MESeed7L8= -k8s.io/apiserver v0.22.1/go.mod h1:2mcM6dzSt+XndzVQJX21Gx0/Klo7Aen7i0Ai6tIa400= -k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE= -k8s.io/client-go v0.22.1 h1:jW0ZSHi8wW260FvcXHkIa0NLxFBQszTlhiAVsU5mopw= -k8s.io/client-go v0.22.1/go.mod h1:BquC5A4UOo4qVDUtoc04/+Nxp1MeHcVc1HJm1KmG8kk= -k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o= -k8s.io/component-base v0.22.1 h1:SFqIXsEN3v3Kkr1bS6rstrs1wd45StJqbtgbQ4nRQdo= -k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo= +k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k= +k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= +k8s.io/apiserver v0.26.3 h1:blBpv+yOiozkPH2aqClhJmJY+rp53Tgfac4SKPDJnU4= +k8s.io/apiserver v0.26.3/go.mod h1:CJe/VoQNcXdhm67EvaVjYXxR3QyfwpceKPuPaeLibTA= +k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s= +k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ= +k8s.io/component-base v0.26.3 h1:oC0WMK/ggcbGDTkdcqefI4wIZRYdK3JySx9/HADpV0g= +k8s.io/component-base v0.26.3/go.mod h1:5kj1kZYwSC6ZstHJN7oHBqcJC6yyn41eR+Sqa/mQc8E= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= 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.4.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.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176 h1:Mx0aa+SUAcNRQbs5jUzV8lkDlGFU8laZsY9jrcVX5SY= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c h1:EFfsozyzZ/pggw5qNx7ftTVZdp7WZl+3ih89GEjYEK8= +k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/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.22 h1:fmRfl9WJ4ApJn7LxNuED4m0t18qivVQOxP6aAYG9J6c= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.10.0 h1:HgyZmMpjUOrtkaFtCnfxsR1bGRuFoAczSNbn2MoKj5U= -sigs.k8s.io/controller-runtime v0.10.0/go.mod h1:GCdh6kqV6IY4LK0JLwX0Zm6g233RtVGdb/f0+KSfprg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= +sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA= +sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno= -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.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= 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/pkg/cluster/dask/horizonalpodautoscaler.go b/pkg/cluster/dask/horizonalpodautoscaler.go index 21d5d958..7a6e6a13 100644 --- a/pkg/cluster/dask/horizonalpodautoscaler.go +++ b/pkg/cluster/dask/horizonalpodautoscaler.go @@ -1,7 +1,7 @@ package dask import ( - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -22,8 +22,8 @@ type horizontalPodAutoscalerDS struct { dc *dcv1alpha1.DaskCluster } -func (s *horizontalPodAutoscalerDS) HorizontalPodAutoscaler() *autoscalingv2beta2.HorizontalPodAutoscaler { - hpa := &autoscalingv2beta2.HorizontalPodAutoscaler{ +func (s *horizontalPodAutoscalerDS) HorizontalPodAutoscaler() *autoscalingv2.HorizontalPodAutoscaler { + hpa := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: metav1.ObjectMeta{ Name: meta.InstanceName(s.dc, metadata.ComponentNone), Namespace: s.dc.Namespace, @@ -36,43 +36,43 @@ func (s *horizontalPodAutoscalerDS) HorizontalPodAutoscaler() *autoscalingv2beta return hpa } - var behavior *autoscalingv2beta2.HorizontalPodAutoscalerBehavior + var behavior *autoscalingv2.HorizontalPodAutoscalerBehavior if as.ScaleDownStabilizationWindowSeconds != nil { - behavior = &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ + behavior = &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ StabilizationWindowSeconds: as.ScaleDownStabilizationWindowSeconds, }, } } - var metrics []autoscalingv2beta2.MetricSpec + var metrics []autoscalingv2.MetricSpec if as.AverageCPUUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceCPU, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: s.dc.Spec.Autoscaling.AverageCPUUtilization, }, }, }) } if as.AverageMemoryUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceMemory, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: s.dc.Spec.Autoscaling.AverageMemoryUtilization, }, }, }) } - hpa.Spec = autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + hpa.Spec = autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ Kind: s.dc.Kind, Name: s.dc.Name, APIVersion: s.dc.APIVersion, diff --git a/pkg/cluster/dask/horizontalpodautoscaler_test.go b/pkg/cluster/dask/horizontalpodautoscaler_test.go index c7c80882..6fc60677 100644 --- a/pkg/cluster/dask/horizontalpodautoscaler_test.go +++ b/pkg/cluster/dask/horizontalpodautoscaler_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" @@ -19,7 +19,7 @@ func TestHorizontalPodAutoscaler(t *testing.T) { dc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{} actual := ds.HorizontalPodAutoscaler() - expected := &autoscalingv2beta2.HorizontalPodAutoscaler{ + expected := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: metav1.ObjectMeta{ Name: "test-dask", Namespace: "ns", @@ -30,8 +30,8 @@ func TestHorizontalPodAutoscaler(t *testing.T) { "app.kubernetes.io/version": "test-tag", }, }, - Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + Spec: autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ Kind: "DaskCluster", Name: "test", APIVersion: "distributed-compute.dominodatalab.com/v1test1", @@ -45,7 +45,7 @@ func TestHorizontalPodAutoscaler(t *testing.T) { }) t.Run("min_replicas", func(t *testing.T) { - expected := pointer.Int32Ptr(7) + expected := pointer.Int32(7) dc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ MinReplicas: expected, } @@ -64,20 +64,20 @@ func TestHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_cpu_util", func(t *testing.T) { dc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageCPUUtilization: pointer.Int32Ptr(75), + AverageCPUUtilization: pointer.Int32(75), } ds := horizontalPodAutoscalerDS{dc: dc} hpa := ds.HorizontalPodAutoscaler() - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "cpu", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -87,20 +87,20 @@ func TestHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_memory_util", func(t *testing.T) { dc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageMemoryUtilization: pointer.Int32Ptr(75), + AverageMemoryUtilization: pointer.Int32(75), } ds := horizontalPodAutoscalerDS{dc: dc} hpa := ds.HorizontalPodAutoscaler() - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "memory", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -110,15 +110,15 @@ func TestHorizontalPodAutoscaler(t *testing.T) { t.Run("scale_down_behavior", func(t *testing.T) { dc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - ScaleDownStabilizationWindowSeconds: pointer.Int32Ptr(60), + ScaleDownStabilizationWindowSeconds: pointer.Int32(60), } ds := horizontalPodAutoscalerDS{dc: dc} hpa := ds.HorizontalPodAutoscaler() - expected := &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ - StabilizationWindowSeconds: pointer.Int32Ptr(60), + expected := &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ + StabilizationWindowSeconds: pointer.Int32(60), }, } assert.Equal(t, expected, hpa.Spec.Behavior) diff --git a/pkg/cluster/dask/statefulset.go b/pkg/cluster/dask/statefulset.go index d55965da..96511743 100644 --- a/pkg/cluster/dask/statefulset.go +++ b/pkg/cluster/dask/statefulset.go @@ -239,7 +239,7 @@ func (s *statefulSetDS) resources() corev1.ResourceRequirements { func (s *statefulSetDS) probe() *corev1.Probe { return &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/health", Port: intstr.FromString("dashboard"), @@ -283,7 +283,7 @@ func (c *schedulerConfig) podConfig() dcv1alpha1.WorkloadConfig { } func (c *schedulerConfig) replicas() *int32 { - return pointer.Int32Ptr(1) + return pointer.Int32(1) } func (c *schedulerConfig) commandArgs() []string { diff --git a/pkg/cluster/mpi/statefulset.go b/pkg/cluster/mpi/statefulset.go index a03153c4..ac786320 100644 --- a/pkg/cluster/mpi/statefulset.go +++ b/pkg/cluster/mpi/statefulset.go @@ -337,7 +337,7 @@ func createWorkerContainer(cr *dcv1alpha1.MPICluster, image string, mounts []cor environment = append(environment, workerEnvironmentExtras(cr)...) probe := &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(sshdPort), }, @@ -366,7 +366,7 @@ func createWorkerContainer(cr *dcv1alpha1.MPICluster, image string, mounts []cor func createSidecarContainer(cr *dcv1alpha1.MPICluster, image string, mounts []corev1.VolumeMount) corev1.Container { probe := &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(rsyncPort), }, diff --git a/pkg/controller/components/horizontalpodautoscaler.go b/pkg/controller/components/horizontalpodautoscaler.go index 07d19f9b..e77fae5d 100644 --- a/pkg/controller/components/horizontalpodautoscaler.go +++ b/pkg/controller/components/horizontalpodautoscaler.go @@ -4,7 +4,7 @@ package components import ( "fmt" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -13,7 +13,7 @@ import ( ) type HorizontalPodAutoscalerDataSource interface { - HorizontalPodAutoscaler() *autoscalingv2beta2.HorizontalPodAutoscaler + HorizontalPodAutoscaler() *autoscalingv2.HorizontalPodAutoscaler Delete() bool } @@ -28,7 +28,7 @@ type horizontalPodAutoscaler struct { } func (c *horizontalPodAutoscaler) Kind() client.Object { - return &autoscalingv2beta2.HorizontalPodAutoscaler{} + return &autoscalingv2.HorizontalPodAutoscaler{} } func (c *horizontalPodAutoscaler) Reconcile(ctx *core.Context) (ctrl.Result, error) { diff --git a/pkg/controller/core/patch.go b/pkg/controller/core/patch.go index 306c3020..9521730b 100644 --- a/pkg/controller/core/patch.go +++ b/pkg/controller/core/patch.go @@ -14,13 +14,13 @@ var defaultCalculateOpts = []patch.CalculateOption{ type Patch struct { Annotator *patch.Annotator - Maker *patch.PatchMaker + Maker patch.Maker CalculateOpts []patch.CalculateOption } func NewPatch(gvk schema.GroupVersionKind) *Patch { a := patch.NewAnnotator(path.Join(gvk.Group, "last-applied")) - m := patch.NewPatchMaker(a) + m := patch.NewPatchMaker(a, &patch.K8sStrategicMergePatcher{}, &patch.BaseJSONMergePatcher{}) return &Patch{ Annotator: a, diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go deleted file mode 100644 index 04e36404..00000000 --- a/pkg/logging/logging.go +++ /dev/null @@ -1,52 +0,0 @@ -package logging - -import ( - "context" - - "github.com/go-logr/logr" -) - -// ContextLogger extends logr.Logger with the ability to store and retrieve -// custom loggers using contexts. This interface is intended for use with -// request-scoped operations. -type ContextLogger interface { - logr.Logger - - NewContext(ctx context.Context, keysAndValues ...interface{}) (context.Context, logr.Logger) - FromContext(context.Context) logr.Logger -} - -type loggerKeyType int - -const loggerKey loggerKeyType = iota - -type logger struct { - logr.Logger -} - -// New returns a ContextLogger with an embedded logr.Logger instance. It can be -// used just like a regular logger when its extra context-based capabilities -// are not required. -func New(log logr.Logger) ContextLogger { - return &logger{log} -} - -// NewContext returns a copy of the parent context with a new logger that has -// the key-value pairs added to it. -func (l *logger) NewContext(ctx context.Context, keysAndValues ...interface{}) (context.Context, logr.Logger) { - log := l.WithValues(keysAndValues...) - return context.WithValue(ctx, loggerKey, log), log -} - -// FromContext returns a logger from the context. The root logger is returned -// if the context is nil or does not contain a logger. -func (l *logger) FromContext(ctx context.Context) logr.Logger { - if ctx == nil { - return l - } - if ctxLog, ok := ctx.Value(loggerKey).(logr.Logger); ok { - return ctxLog - } - - return l -} diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index ed80e54a..b21fbace 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -18,7 +18,6 @@ import ( dcv1alpha1 "github.com/dominodatalab/distributed-compute-operator/api/v1alpha1" "github.com/dominodatalab/distributed-compute-operator/controllers" - "github.com/dominodatalab/distributed-compute-operator/pkg/logging" //+kubebuilder:scaffold:imports ) @@ -77,7 +76,7 @@ func Start(cfg *controllers.Config) error { if err = (&controllers.RayClusterReconciler{ Client: mgr.GetClient(), - Log: logging.New(ctrl.Log.WithName("controllers").WithName("RayCluster")), + Log: ctrl.Log.WithName("controllers").WithName("RayCluster"), Scheme: mgr.GetScheme(), IstioEnabled: cfg.IstioEnabled, }).SetupWithManager(mgr); err != nil { @@ -87,7 +86,7 @@ func Start(cfg *controllers.Config) error { if err = (&controllers.SparkClusterReconciler{ Client: mgr.GetClient(), - Log: logging.New(ctrl.Log.WithName("controllers").WithName("SparkCluster")), + Log: ctrl.Log.WithName("controllers").WithName("SparkCluster"), Scheme: mgr.GetScheme(), IstioEnabled: cfg.IstioEnabled, }).SetupWithManager(mgr); err != nil { diff --git a/pkg/resources/ray/helpers_test.go b/pkg/resources/ray/helpers_test.go index 8f1cb4c9..d0dffd98 100644 --- a/pkg/resources/ray/helpers_test.go +++ b/pkg/resources/ray/helpers_test.go @@ -42,7 +42,7 @@ func rayClusterFixture() *dcv1alpha1.RayCluster { WorkerPorts: []int32{11000, 11001}, DashboardPort: 8265, Worker: dcv1alpha1.RayClusterWorker{ - Replicas: pointer.Int32Ptr(5), + Replicas: pointer.Int32(5), }, }, } diff --git a/pkg/resources/ray/horizontalpodautoscaler.go b/pkg/resources/ray/horizontalpodautoscaler.go index 35193e8c..4c47056d 100644 --- a/pkg/resources/ray/horizontalpodautoscaler.go +++ b/pkg/resources/ray/horizontalpodautoscaler.go @@ -3,7 +3,7 @@ package ray import ( "fmt" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -15,51 +15,51 @@ import ( // The metrics-server needs to be launched separately and the worker stateful // set requires cpu resource requests in order for this object to have any // effect. -func NewHorizontalPodAutoscaler(rc *dcv1alpha1.RayCluster) (*autoscalingv2beta2.HorizontalPodAutoscaler, error) { +func NewHorizontalPodAutoscaler(rc *dcv1alpha1.RayCluster) (*autoscalingv2.HorizontalPodAutoscaler, error) { autoscaling := rc.Spec.Autoscaling if autoscaling == nil { return nil, fmt.Errorf("cannot build HPA without autoscaling config") } - var behavior *autoscalingv2beta2.HorizontalPodAutoscalerBehavior + var behavior *autoscalingv2.HorizontalPodAutoscalerBehavior if autoscaling.ScaleDownStabilizationWindowSeconds != nil { - behavior = &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ + behavior = &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ StabilizationWindowSeconds: autoscaling.ScaleDownStabilizationWindowSeconds, }, } } - var metrics []autoscalingv2beta2.MetricSpec + var metrics []autoscalingv2.MetricSpec if autoscaling.AverageCPUUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceCPU, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: autoscaling.AverageCPUUtilization, }, }, }) } if autoscaling.AverageMemoryUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceMemory, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: autoscaling.AverageMemoryUtilization, }, }, }) } - hpa := &autoscalingv2beta2.HorizontalPodAutoscaler{ + hpa := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: HorizontalPodAutoscalerObjectMeta(rc), - Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + Spec: autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ APIVersion: rc.APIVersion, Kind: rc.Kind, Name: rc.Name, diff --git a/pkg/resources/ray/horizontalpodautoscaler_test.go b/pkg/resources/ray/horizontalpodautoscaler_test.go index 9a27b40f..9b684b83 100644 --- a/pkg/resources/ray/horizontalpodautoscaler_test.go +++ b/pkg/resources/ray/horizontalpodautoscaler_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" @@ -19,7 +19,7 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { actual, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := &autoscalingv2beta2.HorizontalPodAutoscaler{ + expected := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: metav1.ObjectMeta{ Name: "test-id-ray", Namespace: "fake-ns", @@ -30,8 +30,8 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { "app.kubernetes.io/managed-by": "distributed-compute-operator", }, }, - Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + Spec: autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ Kind: "RayCluster", Name: "test-id", APIVersion: "distributed-compute.dominodatalab.com/v1test1", @@ -47,7 +47,7 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("min_replicas", func(t *testing.T) { rc := rayClusterFixture() - expected := pointer.Int32Ptr(7) + expected := pointer.Int32(7) rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ MinReplicas: expected, } @@ -75,20 +75,20 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_cpu_util", func(t *testing.T) { rc := rayClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageCPUUtilization: pointer.Int32Ptr(75), + AverageCPUUtilization: pointer.Int32(75), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "cpu", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -99,20 +99,20 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_memory_util", func(t *testing.T) { rc := rayClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageMemoryUtilization: pointer.Int32Ptr(75), + AverageMemoryUtilization: pointer.Int32(75), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "memory", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -123,15 +123,15 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("scale_down_behavior", func(t *testing.T) { rc := rayClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - ScaleDownStabilizationWindowSeconds: pointer.Int32Ptr(60), + ScaleDownStabilizationWindowSeconds: pointer.Int32(60), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ - StabilizationWindowSeconds: pointer.Int32Ptr(60), + expected := &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ + StabilizationWindowSeconds: pointer.Int32(60), }, } assert.Equal(t, expected, hpa.Spec.Behavior) diff --git a/pkg/resources/ray/service_test.go b/pkg/resources/ray/service_test.go index 7dd48ca0..c27fd883 100644 --- a/pkg/resources/ray/service_test.go +++ b/pkg/resources/ray/service_test.go @@ -44,7 +44,7 @@ func TestNewClientService(t *testing.T) { assert.Equal(t, expected, svc) t.Run("with_dashboard_enabled", func(t *testing.T) { - rc.Spec.EnableDashboard = pointer.BoolPtr(true) + rc.Spec.EnableDashboard = pointer.Bool(true) svc := NewClientService(rc) expected.Spec.Ports = append(expected.Spec.Ports, corev1.ServicePort{ diff --git a/pkg/resources/ray/serviceaccount.go b/pkg/resources/ray/serviceaccount.go index fae047f8..c745fb22 100644 --- a/pkg/resources/ray/serviceaccount.go +++ b/pkg/resources/ray/serviceaccount.go @@ -16,6 +16,6 @@ func NewServiceAccount(rc *dcv1alpha1.RayCluster) *corev1.ServiceAccount { Namespace: rc.Namespace, Labels: AddGlobalLabels(MetadataLabels(rc), rc.Spec.GlobalLabels), }, - AutomountServiceAccountToken: pointer.BoolPtr(false), + AutomountServiceAccountToken: pointer.Bool(false), } } diff --git a/pkg/resources/ray/serviceaccount_test.go b/pkg/resources/ray/serviceaccount_test.go index bdd27c0a..61da295e 100644 --- a/pkg/resources/ray/serviceaccount_test.go +++ b/pkg/resources/ray/serviceaccount_test.go @@ -24,7 +24,7 @@ func TestNewServiceAccount(t *testing.T) { "app.kubernetes.io/managed-by": "distributed-compute-operator", }, }, - AutomountServiceAccountToken: pointer.BoolPtr(false), + AutomountServiceAccountToken: pointer.Bool(false), } assert.Equal(t, expected, sa) } diff --git a/pkg/resources/ray/statefulset.go b/pkg/resources/ray/statefulset.go index e2c03df5..037102cf 100644 --- a/pkg/resources/ray/statefulset.go +++ b/pkg/resources/ray/statefulset.go @@ -96,7 +96,7 @@ func NewStatefulSet(rc *dcv1alpha1.RayCluster, comp Component, istioEnabled bool }, Spec: appsv1.StatefulSetSpec{ ServiceName: serviceName, - Replicas: pointer.Int32Ptr(replicas), + Replicas: pointer.Int32(replicas), Selector: &metav1.LabelSelector{ MatchLabels: SelectorLabelsWithComponent(rc, comp), }, @@ -126,14 +126,14 @@ func NewStatefulSet(rc *dcv1alpha1.RayCluster, comp Component, istioEnabled bool VolumeMounts: volumeMounts, Resources: nodeAttrs.Resources, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(int(rc.Spec.NodeManagerPort)), }, }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(int(rc.Spec.NodeManagerPort)), }, diff --git a/pkg/resources/ray/statefulset_test.go b/pkg/resources/ray/statefulset_test.go index 794913c9..17886d3a 100644 --- a/pkg/resources/ray/statefulset_test.go +++ b/pkg/resources/ray/statefulset_test.go @@ -44,7 +44,7 @@ func TestNewStatefulSet(t *testing.T) { }, Spec: appsv1.StatefulSetSpec{ ServiceName: "test-id-ray-head", - Replicas: pointer.Int32Ptr(1), + Replicas: pointer.Int32(1), Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "app.kubernetes.io/name": "ray", @@ -147,14 +147,14 @@ func TestNewStatefulSet(t *testing.T) { }, }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(2385), }, }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(2385), }, @@ -185,7 +185,7 @@ func TestNewStatefulSet(t *testing.T) { t.Run("enable_dashboard", func(t *testing.T) { rc := rayClusterFixture() - rc.Spec.EnableDashboard = pointer.BoolPtr(true) + rc.Spec.EnableDashboard = pointer.Bool(true) rc.Spec.DashboardPort = 8265 actual, err := NewStatefulSet(rc, ComponentHead, false) @@ -222,7 +222,7 @@ func TestNewStatefulSet(t *testing.T) { }, Spec: appsv1.StatefulSetSpec{ ServiceName: "test-id-ray-worker", - Replicas: pointer.Int32Ptr(5), + Replicas: pointer.Int32(5), Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "app.kubernetes.io/name": "ray", @@ -301,14 +301,14 @@ func TestNewStatefulSet(t *testing.T) { }, }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(2385), }, }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ TCPSocket: &corev1.TCPSocketAction{ Port: intstr.FromInt(2385), }, @@ -352,7 +352,7 @@ func testCommonFeatures(t *testing.T, comp Component) { t.Run("object_store_memory", func(t *testing.T) { rc := rayClusterFixture() - rc.Spec.ObjectStoreMemoryBytes = pointer.Int64Ptr(100 * 1 << 20) + rc.Spec.ObjectStoreMemoryBytes = pointer.Int64(100 * 1 << 20) actual, err := NewStatefulSet(rc, comp, false) require.NoError(t, err) @@ -459,7 +459,7 @@ func testCommonFeatures(t *testing.T, comp Component) { elem := dcv1alpha1.PersistentVolumeClaimTemplate{ Name: "stuffz", Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.StringPtr("test-gpu"), + StorageClassName: pointer.String("test-gpu"), }, } input := []dcv1alpha1.PersistentVolumeClaimTemplate{elem} @@ -632,7 +632,7 @@ func testCommonFeatures(t *testing.T, comp Component) { t.Run("security_context", func(t *testing.T) { rc := rayClusterFixture() rc.Spec.PodSecurityContext = &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(0), + RunAsUser: pointer.Int64(0), } actual, err := NewStatefulSet(rc, comp, false) diff --git a/pkg/resources/spark/envoyfilter.go b/pkg/resources/spark/envoyfilter.go index 6be4abc5..20543646 100644 --- a/pkg/resources/spark/envoyfilter.go +++ b/pkg/resources/spark/envoyfilter.go @@ -3,7 +3,7 @@ package spark import ( "fmt" - protobuftypes "github.com/gogo/protobuf/types" + spb "google.golang.org/protobuf/types/known/structpb" networkingv1alpha3 "istio.io/api/networking/v1alpha3" apinetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -30,24 +30,24 @@ func NewEnvoyFilter(sc *dcv1alpha1.SparkCluster) *apinetworkingv1alpha3.EnvoyFil patch := networkingv1alpha3.EnvoyFilter_Patch{ Operation: networkingv1alpha3.EnvoyFilter_Patch_MERGE, - Value: &protobuftypes.Struct{ - Fields: map[string]*protobuftypes.Value{ + Value: &spb.Struct{ + Fields: map[string]*spb.Value{ "name": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "envoy.filters.network.tcp_proxy", }, }, "typed_config": { - Kind: &protobuftypes.Value_StructValue{ - StructValue: &protobuftypes.Struct{ - Fields: map[string]*protobuftypes.Value{ + Kind: &spb.Value_StructValue{ + StructValue: &spb.Struct{ + Fields: map[string]*spb.Value{ "@type": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", }, }, "idle_timeout": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "0s", }, }, diff --git a/pkg/resources/spark/envoyfilter_test.go b/pkg/resources/spark/envoyfilter_test.go index 6f909574..2475c22e 100644 --- a/pkg/resources/spark/envoyfilter_test.go +++ b/pkg/resources/spark/envoyfilter_test.go @@ -3,8 +3,8 @@ package spark import ( "testing" - protobuftypes "github.com/gogo/protobuf/types" "github.com/stretchr/testify/assert" + spb "google.golang.org/protobuf/types/known/structpb" networkingv1alpha3 "istio.io/api/networking/v1alpha3" apinetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -17,24 +17,24 @@ func TestNewEnvoyFilter(t *testing.T) { patch := networkingv1alpha3.EnvoyFilter_Patch{ Operation: networkingv1alpha3.EnvoyFilter_Patch_MERGE, - Value: &protobuftypes.Struct{ - Fields: map[string]*protobuftypes.Value{ + Value: &spb.Struct{ + Fields: map[string]*spb.Value{ "name": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "envoy.filters.network.tcp_proxy", }, }, "typed_config": { - Kind: &protobuftypes.Value_StructValue{ - StructValue: &protobuftypes.Struct{ - Fields: map[string]*protobuftypes.Value{ + Kind: &spb.Value_StructValue{ + StructValue: &spb.Struct{ + Fields: map[string]*spb.Value{ "@type": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", }, }, "idle_timeout": { - Kind: &protobuftypes.Value_StringValue{ + Kind: &spb.Value_StringValue{ StringValue: "0s", }, }, diff --git a/pkg/resources/spark/helpers_test.go b/pkg/resources/spark/helpers_test.go index 432fdcd9..8c0a7979 100644 --- a/pkg/resources/spark/helpers_test.go +++ b/pkg/resources/spark/helpers_test.go @@ -35,7 +35,7 @@ func sparkClusterFixture() *dcv1alpha1.SparkCluster { WorkerWebPort: 8081, WorkerMemoryLimit: "4505m", Worker: dcv1alpha1.SparkClusterWorker{ - Replicas: pointer.Int32Ptr(5), + Replicas: pointer.Int32(5), }, }, } diff --git a/pkg/resources/spark/horizontalpodautoscaler.go b/pkg/resources/spark/horizontalpodautoscaler.go index a15f6f06..e19620aa 100644 --- a/pkg/resources/spark/horizontalpodautoscaler.go +++ b/pkg/resources/spark/horizontalpodautoscaler.go @@ -3,7 +3,7 @@ package spark import ( "fmt" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -14,51 +14,51 @@ import ( // // The metrics-server needs to be launched separately and the worker deployment // requires cpu resource requests in order for this object to have any effect. -func NewHorizontalPodAutoscaler(sc *dcv1alpha1.SparkCluster) (*autoscalingv2beta2.HorizontalPodAutoscaler, error) { +func NewHorizontalPodAutoscaler(sc *dcv1alpha1.SparkCluster) (*autoscalingv2.HorizontalPodAutoscaler, error) { autoscaling := sc.Spec.Autoscaling if autoscaling == nil { return nil, fmt.Errorf("cannot build HPA without autoscaling config") } - var behavior *autoscalingv2beta2.HorizontalPodAutoscalerBehavior + var behavior *autoscalingv2.HorizontalPodAutoscalerBehavior if autoscaling.ScaleDownStabilizationWindowSeconds != nil { - behavior = &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ + behavior = &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ StabilizationWindowSeconds: autoscaling.ScaleDownStabilizationWindowSeconds, }, } } - var metrics []autoscalingv2beta2.MetricSpec + var metrics []autoscalingv2.MetricSpec if autoscaling.AverageCPUUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceCPU, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: autoscaling.AverageCPUUtilization, }, }, }) } if autoscaling.AverageMemoryUtilization != nil { - metrics = append(metrics, autoscalingv2beta2.MetricSpec{ - Type: autoscalingv2beta2.ResourceMetricSourceType, - Resource: &autoscalingv2beta2.ResourceMetricSource{ + metrics = append(metrics, autoscalingv2.MetricSpec{ + Type: autoscalingv2.ResourceMetricSourceType, + Resource: &autoscalingv2.ResourceMetricSource{ Name: corev1.ResourceMemory, - Target: autoscalingv2beta2.MetricTarget{ - Type: autoscalingv2beta2.UtilizationMetricType, + Target: autoscalingv2.MetricTarget{ + Type: autoscalingv2.UtilizationMetricType, AverageUtilization: autoscaling.AverageMemoryUtilization, }, }, }) } - hpa := &autoscalingv2beta2.HorizontalPodAutoscaler{ + hpa := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: HorizontalPodAutoscalerObjectMeta(sc), - Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + Spec: autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ APIVersion: sc.APIVersion, Kind: sc.Kind, Name: sc.Name, diff --git a/pkg/resources/spark/horizontalpodautoscaler_test.go b/pkg/resources/spark/horizontalpodautoscaler_test.go index 25f2e1e0..055bbdee 100644 --- a/pkg/resources/spark/horizontalpodautoscaler_test.go +++ b/pkg/resources/spark/horizontalpodautoscaler_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" + autoscalingv2 "k8s.io/api/autoscaling/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" @@ -19,7 +19,7 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { actual, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := &autoscalingv2beta2.HorizontalPodAutoscaler{ + expected := &autoscalingv2.HorizontalPodAutoscaler{ ObjectMeta: metav1.ObjectMeta{ Name: "test-id-spark", Namespace: "fake-ns", @@ -30,8 +30,8 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { "app.kubernetes.io/managed-by": "distributed-compute-operator", }, }, - Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{ - ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{ + Spec: autoscalingv2.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{ Kind: "SparkCluster", Name: "test-id", APIVersion: "distributed-compute.dominodatalab.com/v1test1", @@ -47,7 +47,7 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("min_replicas", func(t *testing.T) { rc := sparkClusterFixture() - expected := pointer.Int32Ptr(7) + expected := pointer.Int32(7) rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ MinReplicas: expected, } @@ -75,20 +75,20 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_cpu_util", func(t *testing.T) { rc := sparkClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageCPUUtilization: pointer.Int32Ptr(75), + AverageCPUUtilization: pointer.Int32(75), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "cpu", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -99,20 +99,20 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("avg_memory_util", func(t *testing.T) { rc := sparkClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - AverageMemoryUtilization: pointer.Int32Ptr(75), + AverageMemoryUtilization: pointer.Int32(75), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := []autoscalingv2beta2.MetricSpec{ + expected := []autoscalingv2.MetricSpec{ { Type: "Resource", - Resource: &autoscalingv2beta2.ResourceMetricSource{ + Resource: &autoscalingv2.ResourceMetricSource{ Name: "memory", - Target: autoscalingv2beta2.MetricTarget{ + Target: autoscalingv2.MetricTarget{ Type: "Utilization", - AverageUtilization: pointer.Int32Ptr(75), + AverageUtilization: pointer.Int32(75), }, }, }, @@ -123,15 +123,15 @@ func TestNewHorizontalPodAutoscaler(t *testing.T) { t.Run("scale_down_behavior", func(t *testing.T) { rc := sparkClusterFixture() rc.Spec.Autoscaling = &dcv1alpha1.Autoscaling{ - ScaleDownStabilizationWindowSeconds: pointer.Int32Ptr(60), + ScaleDownStabilizationWindowSeconds: pointer.Int32(60), } hpa, err := NewHorizontalPodAutoscaler(rc) require.NoError(t, err) - expected := &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{ - ScaleDown: &autoscalingv2beta2.HPAScalingRules{ - StabilizationWindowSeconds: pointer.Int32Ptr(60), + expected := &autoscalingv2.HorizontalPodAutoscalerBehavior{ + ScaleDown: &autoscalingv2.HPAScalingRules{ + StabilizationWindowSeconds: pointer.Int32(60), }, } assert.Equal(t, expected, hpa.Spec.Behavior) diff --git a/pkg/resources/spark/serviceaccount.go b/pkg/resources/spark/serviceaccount.go index 517ee5c4..ea051aab 100644 --- a/pkg/resources/spark/serviceaccount.go +++ b/pkg/resources/spark/serviceaccount.go @@ -16,6 +16,6 @@ func NewServiceAccount(sc *dcv1alpha1.SparkCluster) *corev1.ServiceAccount { Namespace: sc.Namespace, Labels: AddGlobalLabels(MetadataLabels(sc), sc.Spec.GlobalLabels), }, - AutomountServiceAccountToken: pointer.BoolPtr(false), + AutomountServiceAccountToken: pointer.Bool(false), } } diff --git a/pkg/resources/spark/serviceaccount_test.go b/pkg/resources/spark/serviceaccount_test.go index 5a30e2f3..7bb4b910 100644 --- a/pkg/resources/spark/serviceaccount_test.go +++ b/pkg/resources/spark/serviceaccount_test.go @@ -24,7 +24,7 @@ func TestNewServiceAccount(t *testing.T) { "app.kubernetes.io/managed-by": "distributed-compute-operator", }, }, - AutomountServiceAccountToken: pointer.BoolPtr(false), + AutomountServiceAccountToken: pointer.Bool(false), } assert.Equal(t, expected, sa) } diff --git a/pkg/resources/spark/statefulset.go b/pkg/resources/spark/statefulset.go index e8678a02..a7be9502 100644 --- a/pkg/resources/spark/statefulset.go +++ b/pkg/resources/spark/statefulset.go @@ -100,8 +100,8 @@ func NewStatefulSet(sc *dcv1alpha1.SparkCluster, comp Component) (*appsv1.Statef const DefaultUser = 1001 const DefaultFSGroup = 1001 context = &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(DefaultUser), - FSGroup: pointer.Int64Ptr(DefaultFSGroup), + RunAsUser: pointer.Int64(DefaultUser), + FSGroup: pointer.Int64(DefaultFSGroup), } } podSpec := getPodSpec(sc, @@ -124,7 +124,7 @@ func NewStatefulSet(sc *dcv1alpha1.SparkCluster, comp Component) (*appsv1.Statef }, Spec: appsv1.StatefulSetSpec{ ServiceName: InstanceObjectName(sc.Name, comp), - Replicas: pointer.Int32Ptr(replicas), + Replicas: pointer.Int32(replicas), Selector: &metav1.LabelSelector{ MatchLabels: SelectorLabelsWithComponent(sc, comp), }, @@ -206,7 +206,7 @@ func getPodSpec(sc *dcv1alpha1.SparkCluster, VolumeMounts: volumeMounts, Resources: nodeAttrs.Resources, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/", Port: port, @@ -214,7 +214,7 @@ func getPodSpec(sc *dcv1alpha1.SparkCluster, }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Path: "/", Port: port, diff --git a/pkg/resources/spark/statefulset_test.go b/pkg/resources/spark/statefulset_test.go index 315458ad..edd6d4d3 100644 --- a/pkg/resources/spark/statefulset_test.go +++ b/pkg/resources/spark/statefulset_test.go @@ -44,7 +44,7 @@ func TestNewStatefulSet(t *testing.T) { }, Spec: appsv1.StatefulSetSpec{ ServiceName: "test-id-spark-master", - Replicas: pointer.Int32Ptr(1), + Replicas: pointer.Int32(1), Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "app.kubernetes.io/name": "spark", @@ -96,7 +96,7 @@ func TestNewStatefulSet(t *testing.T) { }, }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Port: intstr.FromInt(8080), Path: "/", @@ -104,7 +104,7 @@ func TestNewStatefulSet(t *testing.T) { }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Port: intstr.FromInt(8080), Path: "/", @@ -114,8 +114,8 @@ func TestNewStatefulSet(t *testing.T) { }, }, SecurityContext: &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(1001), - FSGroup: pointer.Int64Ptr(1001), + RunAsUser: pointer.Int64(1001), + FSGroup: pointer.Int64(1001), }, }, }, @@ -149,7 +149,7 @@ func TestNewStatefulSet(t *testing.T) { }, Spec: appsv1.StatefulSetSpec{ ServiceName: "test-id-spark-worker", - Replicas: pointer.Int32Ptr(5), + Replicas: pointer.Int32(5), Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "app.kubernetes.io/name": "spark", @@ -209,7 +209,7 @@ func TestNewStatefulSet(t *testing.T) { }, }, LivenessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Port: intstr.FromInt(8081), Path: "/", @@ -217,7 +217,7 @@ func TestNewStatefulSet(t *testing.T) { }, }, ReadinessProbe: &corev1.Probe{ - Handler: corev1.Handler{ + ProbeHandler: corev1.ProbeHandler{ HTTPGet: &corev1.HTTPGetAction{ Port: intstr.FromInt(8081), Path: "/", @@ -227,8 +227,8 @@ func TestNewStatefulSet(t *testing.T) { }, }, SecurityContext: &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(1001), - FSGroup: pointer.Int64Ptr(1001), + RunAsUser: pointer.Int64(1001), + FSGroup: pointer.Int64(1001), }, }, }, @@ -471,7 +471,7 @@ func testCommonFeatures(t *testing.T, comp Component) { t.Run("security_context", func(t *testing.T) { rc := sparkClusterFixture() rc.Spec.PodSecurityContext = &corev1.PodSecurityContext{ - RunAsUser: pointer.Int64Ptr(0), + RunAsUser: pointer.Int64(0), } actual, err := NewStatefulSet(rc, comp) @@ -496,7 +496,7 @@ func testCommonFeatures(t *testing.T, comp Component) { elem := dcv1alpha1.PersistentVolumeClaimTemplate{ Name: "stuffz", Spec: corev1.PersistentVolumeClaimSpec{ - StorageClassName: pointer.StringPtr("test-gpu"), + StorageClassName: pointer.String("test-gpu"), }, } input := []dcv1alpha1.PersistentVolumeClaimTemplate{elem} @@ -539,7 +539,7 @@ func testCommonFeatures(t *testing.T, comp Component) { SparkClusterNode: dcv1alpha1.SparkClusterNode{ DefaultConfiguration: fcWorker, }, - Replicas: pointer.Int32Ptr(2), + Replicas: pointer.Int32(2), } expectedVolumes := []corev1.Volume{