diff --git a/.github/workflows/cts.yaml b/.github/workflows/cts.yaml index 05d5047be..c99d92442 100644 --- a/.github/workflows/cts.yaml +++ b/.github/workflows/cts.yaml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - name: install kubebuilder run: | OS=$(uname -s | tr '[:upper:]' '[:lower:]') @@ -128,7 +128,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - name: Deploy operator timeout-minutes: 5 uses: ./.github/actions/deploy-operator diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 9305561a5..c1d5d8020 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - name: Build image env: IMG: "emqx/emqx-operator-controller:${{ github.sha }}" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3401dfc86..128b1b862 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - uses: golangci/golangci-lint-action@v4 with: ##https://github.com/golangci/golangci-lint-action/issues/807 @@ -80,7 +80,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - run: go install github.com/onsi/ginkgo/v2/ginkgo@latest - name: Install Telepresence env: @@ -112,7 +112,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - run: make test - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml index d2ce03a0e..4e8563ec0 100644 --- a/.github/workflows/upgrade.yaml +++ b/.github/workflows/upgrade.yaml @@ -37,7 +37,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version-file: 'go.mod' - name: Get pre stable version ## Just get the last stable version, ignore the pre-release version run: | diff --git a/Dockerfile b/Dockerfile index ca062cd4b..bfb69eb75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.21 as builder +FROM golang:1.22 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/Makefile b/Makefile index 250fa007c..ad7247068 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ TELEPRESENCE_GEN ?= $(LOCALBIN)/telepresence ## Tool Versions KUSTOMIZE_VERSION ?= v4 -CONTROLLER_TOOLS_VERSION ?= v0.9.2 +CONTROLLER_TOOLS_VERSION ?= latest ENVTEST_VERSION ?= latest CRD_REF_DOCS_VERSION ?= latest diff --git a/apis/apps/v1beta3/zz_generated.deepcopy.go b/apis/apps/v1beta3/zz_generated.deepcopy.go index c94522e92..10c7cc217 100644 --- a/apis/apps/v1beta3/zz_generated.deepcopy.go +++ b/apis/apps/v1beta3/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021. diff --git a/apis/apps/v1beta4/zz_generated.deepcopy.go b/apis/apps/v1beta4/zz_generated.deepcopy.go index b3fecf9a5..e322b4f11 100644 --- a/apis/apps/v1beta4/zz_generated.deepcopy.go +++ b/apis/apps/v1beta4/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021. diff --git a/apis/apps/v2alpha1/zz_generated.deepcopy.go b/apis/apps/v2alpha1/zz_generated.deepcopy.go index 92fe0a210..df29be7db 100644 --- a/apis/apps/v2alpha1/zz_generated.deepcopy.go +++ b/apis/apps/v2alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021. diff --git a/apis/apps/v2beta1/emqx_types.go b/apis/apps/v2beta1/emqx_types.go index 3f5b6e860..5c51d73da 100644 --- a/apis/apps/v2beta1/emqx_types.go +++ b/apis/apps/v2beta1/emqx_types.go @@ -22,7 +22,7 @@ import ( ) // +kubebuilder:object:root=true -// +kubebuilder:resource:shortName=emqx +// +kubebuilder:resource:shortName=emqx,path=emqxes // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicantTemplate.spec.replicas,statuspath=.status.replicantNodeReplicas diff --git a/apis/apps/v2beta1/zz_generated.deepcopy.go b/apis/apps/v2beta1/zz_generated.deepcopy.go index 503b9d792..77fed49ac 100644 --- a/apis/apps/v2beta1/zz_generated.deepcopy.go +++ b/apis/apps/v2beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021. diff --git a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml index 56bae43d7..fb047f3da 100644 --- a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml +++ b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxbrokers.apps.emqx.io spec: group: apps.emqx.io @@ -1244,6 +1243,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1334,6 +1334,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1620,6 +1621,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1683,6 +1685,8 @@ spec: username: default: admin type: string + required: + - image type: object env: items: @@ -1987,6 +1991,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2091,6 +2096,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2276,6 +2282,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2631,6 +2638,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2735,6 +2743,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2920,6 +2929,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4003,6 +4013,8 @@ spec: type: string version: type: string + required: + - version type: object lifecycle: properties: @@ -4141,6 +4153,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4243,6 +4256,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4417,6 +4431,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4761,6 +4776,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4865,6 +4881,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5050,6 +5067,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5399,6 +5417,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5503,6 +5522,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5688,6 +5708,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6043,6 +6064,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6147,6 +6169,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6332,6 +6355,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml index 0d1864e06..b960198ae 100644 --- a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml +++ b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxenterprises.apps.emqx.io spec: group: apps.emqx.io @@ -1254,6 +1253,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1347,6 +1347,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1633,6 +1634,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1696,6 +1698,8 @@ spec: username: default: admin type: string + required: + - image type: object env: items: @@ -2000,6 +2004,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2104,6 +2109,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2289,6 +2295,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2644,6 +2651,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2748,6 +2756,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2933,6 +2942,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4047,6 +4057,8 @@ spec: type: string version: type: string + required: + - version type: object lifecycle: properties: @@ -4185,6 +4197,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4287,6 +4300,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4461,6 +4475,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4805,6 +4820,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4909,6 +4925,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5094,6 +5111,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5443,6 +5461,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5547,6 +5566,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5732,6 +5752,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6087,6 +6108,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6191,6 +6213,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6376,6 +6399,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/apps.emqx.io_emqxes.yaml b/config/crd/bases/apps.emqx.io_emqxes.yaml index e077c8909..93b64b68a 100644 --- a/config/crd/bases/apps.emqx.io_emqxes.yaml +++ b/config/crd/bases/apps.emqx.io_emqxes.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxes.apps.emqx.io spec: group: apps.emqx.io @@ -880,6 +879,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -984,6 +984,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1169,6 +1170,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2291,6 +2293,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2395,6 +2398,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2580,6 +2584,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2825,6 +2830,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2993,6 +2999,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -3106,6 +3113,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -3446,9 +3454,9 @@ spec: format: int32 type: integer protocol: - default: TCP type: string required: + - error - port - protocol type: object @@ -3649,9 +3657,9 @@ spec: format: int32 type: integer protocol: - default: TCP type: string required: + - error - port - protocol type: object @@ -4485,6 +4493,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4589,6 +4598,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4774,6 +4784,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5896,6 +5907,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6000,6 +6012,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6185,6 +6198,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6430,6 +6444,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6598,6 +6613,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6711,6 +6727,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7761,6 +7778,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7865,6 +7883,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8050,6 +8069,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9172,6 +9192,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9276,6 +9297,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9461,6 +9483,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9713,6 +9736,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9895,6 +9919,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -10008,6 +10033,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11306,6 +11332,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11410,6 +11437,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11595,6 +11623,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -12717,6 +12746,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -12821,6 +12851,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13006,6 +13037,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13258,6 +13290,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13440,6 +13473,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13553,6 +13587,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/apps.emqx.io_emqxplugins.yaml b/config/crd/bases/apps.emqx.io_emqxplugins.yaml index 9eef591e8..da9678426 100644 --- a/config/crd/bases/apps.emqx.io_emqxplugins.yaml +++ b/config/crd/bases/apps.emqx.io_emqxplugins.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxplugins.apps.emqx.io spec: group: apps.emqx.io @@ -38,6 +37,9 @@ spec: additionalProperties: type: string type: object + required: + - pluginName + - selector type: object status: properties: @@ -71,6 +73,9 @@ spec: additionalProperties: type: string type: object + required: + - pluginName + - selector type: object type: object served: true diff --git a/config/crd/bases/apps.emqx.io_rebalances.yaml b/config/crd/bases/apps.emqx.io_rebalances.yaml index 16bceaafc..b0056f2ea 100644 --- a/config/crd/bases/apps.emqx.io_rebalances.yaml +++ b/config/crd/bases/apps.emqx.io_rebalances.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.2 name: rebalances.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index e41a782b6..c655ac391 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,33 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: - "" resources: - configmaps - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - resources: - endpoints - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - resources: - events + - persistentvolumes + - secrets + - services verbs: - create - get @@ -46,16 +30,6 @@ rules: - list - update - watch -- apiGroups: - - "" - resources: - - persistentvolumes - verbs: - - create - - get - - list - - update - - watch - apiGroups: - "" resources: @@ -71,40 +45,10 @@ rules: - pods/status verbs: - patch -- apiGroups: - - "" - resources: - - secrets - verbs: - - create - - get - - list - - update - - watch -- apiGroups: - - "" - resources: - - services - verbs: - - create - - get - - list - - update - - watch - apiGroups: - apps resources: - replicasets - verbs: - - create - - delete - - get - - list - - update - - watch -- apiGroups: - - apps - resources: - statefulsets verbs: - create @@ -117,109 +61,9 @@ rules: - apps.emqx.io resources: - emqxbrokers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apps.emqx.io - resources: - - emqxbrokers/finalizers - verbs: - - update -- apiGroups: - - apps.emqx.io - resources: - - emqxbrokers/status - verbs: - - get - - patch - - update -- apiGroups: - - apps.emqx.io - resources: - emqxenterprises - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apps.emqx.io - resources: - - emqxenterprises/finalizers - verbs: - - update -- apiGroups: - - apps.emqx.io - resources: - - emqxenterprises/status - verbs: - - get - - patch - - update -- apiGroups: - - apps.emqx.io - resources: - emqxes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apps.emqx.io - resources: - - emqxes/finalizers - verbs: - - update -- apiGroups: - - apps.emqx.io - resources: - - emqxes/status - verbs: - - get - - patch - - update -- apiGroups: - - apps.emqx.io - resources: - emqxplugins - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - apps.emqx.io - resources: - - emqxplugins/finalizers - verbs: - - update -- apiGroups: - - apps.emqx.io - resources: - - emqxplugins/status - verbs: - - get - - patch - - update -- apiGroups: - - apps.emqx.io - resources: - rebalances verbs: - create @@ -232,12 +76,20 @@ rules: - apiGroups: - apps.emqx.io resources: + - emqxbrokers/finalizers + - emqxenterprises/finalizers + - emqxes/finalizers + - emqxplugins/finalizers - rebalances/finalizers verbs: - update - apiGroups: - apps.emqx.io resources: + - emqxbrokers/status + - emqxenterprises/status + - emqxes/status + - emqxplugins/status - rebalances/status verbs: - get diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index f908ba199..9d96e0e56 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: @@ -33,9 +32,9 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-apps-emqx-io-v1beta4-emqxenterprise + path: /mutate-apps-emqx-io-v1beta4-emqxplugin failurePolicy: Fail - name: mutating.enterprise.emqx.io + name: mutating.emqxplugin.emqx.io rules: - apiGroups: - apps.emqx.io @@ -45,7 +44,7 @@ webhooks: - CREATE - UPDATE resources: - - emqxenterprises + - emqxplugins sideEffects: None - admissionReviewVersions: - v1 @@ -54,9 +53,9 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-apps-emqx-io-v1beta4-emqxplugin + path: /mutate-apps-emqx-io-v1beta4-emqxenterprise failurePolicy: Fail - name: mutating.emqxplugin.emqx.io + name: mutating.enterprise.emqx.io rules: - apiGroups: - apps.emqx.io @@ -66,13 +65,12 @@ webhooks: - CREATE - UPDATE resources: - - emqxplugins + - emqxenterprises sideEffects: None --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: @@ -124,9 +122,9 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-apps-emqx-io-v1beta4-emqxenterprise + path: /validate-apps-emqx-io-v1beta4-emqxplugin failurePolicy: Fail - name: validator.enterprise.emqx.io + name: validator.emqxplugin.emqx.io rules: - apiGroups: - apps.emqx.io @@ -136,7 +134,7 @@ webhooks: - CREATE - UPDATE resources: - - emqxenterprises + - emqxplugins sideEffects: None - admissionReviewVersions: - v1 @@ -145,9 +143,9 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-apps-emqx-io-v1beta4-emqxplugin + path: /validate-apps-emqx-io-v1beta4-emqxenterprise failurePolicy: Fail - name: validator.emqxplugin.emqx.io + name: validator.enterprise.emqx.io rules: - apiGroups: - apps.emqx.io @@ -157,5 +155,5 @@ webhooks: - CREATE - UPDATE resources: - - emqxplugins + - emqxenterprises sideEffects: None diff --git a/deploy/charts/emqx-operator/Chart.yaml b/deploy/charts/emqx-operator/Chart.yaml index 3de3bfee5..a08c8f286 100644 --- a/deploy/charts/emqx-operator/Chart.yaml +++ b/deploy/charts/emqx-operator/Chart.yaml @@ -15,12 +15,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.23 +version: 2.2.24-rc.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.2.23 +appVersion: 2.2.24-rc.1 sources: - https://github.com/emqx/emqx-operator/tree/main/deploy/charts/emqx-operator diff --git a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml index 89403edf0..adf761185 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml @@ -5,7 +5,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxbrokers.apps.emqx.io spec: conversion: @@ -1255,6 +1255,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1345,6 +1346,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1631,6 +1633,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1694,6 +1697,8 @@ spec: username: default: admin type: string + required: + - image type: object env: items: @@ -1998,6 +2003,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2102,6 +2108,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2287,6 +2294,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2642,6 +2650,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2746,6 +2755,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2931,6 +2941,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4014,6 +4025,8 @@ spec: type: string version: type: string + required: + - version type: object lifecycle: properties: @@ -4152,6 +4165,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4254,6 +4268,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4428,6 +4443,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4772,6 +4788,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4876,6 +4893,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5061,6 +5079,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5410,6 +5429,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5514,6 +5534,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5699,6 +5720,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6054,6 +6076,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6158,6 +6181,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6343,6 +6367,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml index f2621fcec..4a9955afe 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxenterprises.apps.emqx.io spec: conversion: @@ -1266,6 +1266,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1359,6 +1360,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1645,6 +1647,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1708,6 +1711,8 @@ spec: username: default: admin type: string + required: + - image type: object env: items: @@ -2012,6 +2017,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2116,6 +2122,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2301,6 +2308,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2656,6 +2664,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2760,6 +2769,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2945,6 +2955,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4059,6 +4070,8 @@ spec: type: string version: type: string + required: + - version type: object lifecycle: properties: @@ -4197,6 +4210,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4299,6 +4313,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4473,6 +4488,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4817,6 +4833,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4921,6 +4938,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5106,6 +5124,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5455,6 +5474,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5559,6 +5579,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5744,6 +5765,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6099,6 +6121,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6203,6 +6226,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6388,6 +6412,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml index b0eab843c..ee80a5ef5 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxes.apps.emqx.io spec: conversion: @@ -892,6 +892,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -996,6 +997,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1181,6 +1183,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2303,6 +2306,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2407,6 +2411,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2592,6 +2597,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2837,6 +2843,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -3005,6 +3012,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -3118,6 +3126,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -3458,9 +3467,9 @@ spec: format: int32 type: integer protocol: - default: TCP type: string required: + - error - port - protocol type: object @@ -3661,9 +3670,9 @@ spec: format: int32 type: integer protocol: - default: TCP type: string required: + - error - port - protocol type: object @@ -4497,6 +4506,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4601,6 +4611,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4786,6 +4797,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5908,6 +5920,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6012,6 +6025,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6197,6 +6211,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6442,6 +6457,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6610,6 +6626,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6723,6 +6740,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7773,6 +7791,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7877,6 +7896,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8062,6 +8082,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9184,6 +9205,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9288,6 +9310,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9473,6 +9496,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9725,6 +9749,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9907,6 +9932,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -10020,6 +10046,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11318,6 +11345,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11422,6 +11450,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -11607,6 +11636,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -12729,6 +12759,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -12833,6 +12864,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13018,6 +13050,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13270,6 +13303,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13452,6 +13486,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -13565,6 +13600,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml index e6a01240f..5a1586299 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.16.2 name: emqxplugins.apps.emqx.io spec: conversion: @@ -50,6 +50,9 @@ spec: additionalProperties: type: string type: object + required: + - pluginName + - selector type: object status: properties: @@ -83,6 +86,9 @@ spec: additionalProperties: type: string type: object + required: + - pluginName + - selector type: object type: object served: true diff --git a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml index e2aae02ba..3e69be2a2 100644 --- a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.16.2 name: rebalances.apps.emqx.io spec: conversion: diff --git a/docs/en_US/reference/v1beta3-reference.md b/docs/en_US/reference/v1beta3-reference.md index 17cc4ee71..d34c95966 100644 --- a/docs/en_US/reference/v1beta3-reference.md +++ b/docs/en_US/reference/v1beta3-reference.md @@ -47,6 +47,10 @@ ConditionType defines the condition that the RF can have _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `PluginInitialized` | | +| `Running` | | @@ -129,8 +133,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `registry` _string_ | Registry will used for EMQX owner image,
like ${registry}/emqx/emqx and ${registry}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | -| `image` _string_ | | | Required: {}
| +| `registry` _string_ | Registry will used for EMQX owner image,
like $\{registry\}/emqx/emqx and $\{registry\}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | +| `image` _string_ | | | Required: \{\}
| | `imagePullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Image pull policy.
One of Always, Never, IfNotPresent.
Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | | | | `username` _string_ | Username for EMQX Dashboard and API | admin | | | `password` _string_ | Password for EMQX Dashboard and API | public | | @@ -197,7 +201,7 @@ _Appears in:_ | --- | --- | --- | --- | | `name` _string_ | | | | | `enable` _boolean_ | | | | -| `configs` _[RawExtension](#rawextension)_ | | | | +| `configs` _[RawExtension](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#rawextension-runtime-pkg)_ | | | | @@ -241,8 +245,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `registry` _string_ | Registry will used for EMQX owner image,
like ${registry}/emqx/emqx-ee and ${registry}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | -| `image` _string_ | | | Required: {}
| +| `registry` _string_ | Registry will used for EMQX owner image,
like $\{registry\}/emqx/emqx-ee and $\{registry\}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | +| `image` _string_ | | | Required: \{\}
| | `imagePullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Image pull policy.
One of Always, Never, IfNotPresent.
Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | | | | `username` _string_ | Username for EMQX Dashboard and API | admin | | | `password` _string_ | Password for EMQX Dashboard and API | public | | @@ -312,8 +316,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: {}
| -| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: {}
| +| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: \{\}
| +| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: \{\}
| | `config` _object (keys:string, values:string)_ | Config defines the configurations of the EMQX plugins | | | diff --git a/docs/en_US/reference/v1beta4-reference.md b/docs/en_US/reference/v1beta4-reference.md index 75e72e2e3..d4eb882ff 100644 --- a/docs/en_US/reference/v1beta4-reference.md +++ b/docs/en_US/reference/v1beta4-reference.md @@ -67,6 +67,10 @@ ConditionType defines the condition that the RF can have _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `Running` | | +| `BlueGreenUpdating` | | @@ -181,7 +185,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `image` _[EmqxImage](#emqximage)_ | Container image.
The image is generated by "${Registry}/${Repository}:${Prefix}${Version}${Suffix}". | | | +| `image` _[EmqxImage](#emqximage)_ | Container image.
The image is generated by "$\{Registry\}/$\{Repository\}:$\{Prefix\}$\{Version\}$\{Suffix\}". | | | | `command` _string array_ | Entrypoint array. Not executed within a shell.
The container image's ENTRYPOINT is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
of whether the variable exists or not. Cannot be updated.
More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell | | | | `args` _string array_ | Arguments to the entrypoint.
The container image's CMD is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
of whether the variable exists or not. Cannot be updated.
More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell | | | | `workingDir` _string_ | Container's working directory.
If not specified, the container runtime's default will be used, which
might be configured in the container image.
Cannot be updated. | | | @@ -325,7 +329,7 @@ _Appears in:_ | --- | --- | --- | --- | | `registry` _string_ | Container image registry | | | | `repository` _string_ | Container image repository
Defaults to "emqx/emqx" if kind is EmqxBroker, or "emqx/emqx-ee" if kind is EmqxEnterprise | | | -| `version` _string_ | Container image tag version, must semver format or "latest" | | Required: {}
| +| `version` _string_ | Container image tag version, must semver format or "latest" | | Required: \{\}
| | `prefix` _string_ | Container image tag prefix, like "v" | | | | `suffix` _string_ | Container image tag suffix, like "-alpine" | | | | `pullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Container image pull policy.
One of Always, Never, IfNotPresent.
Defaults to IfNotPresent.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | IfNotPresent | Enum: [Always Never IfNotPresent]
| @@ -401,8 +405,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: {}
| -| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: {}
| +| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: \{\}
| +| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: \{\}
| | `config` _object (keys:string, values:string)_ | Config defines the configurations of the EMQX plugins | | | @@ -530,6 +534,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceCondition](#rebalancecondition) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceList @@ -561,6 +570,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceStatus](#rebalancestatus) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceSpec @@ -576,8 +590,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `instanceName` _string_ | InstanceName represents the name of EmqxEnterprise CR | | Required: {}
| -| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: {}
| +| `instanceName` _string_ | InstanceName represents the name of EmqxEnterprise CR | | Required: \{\}
| +| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: \{\}
| #### RebalanceState @@ -635,7 +649,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: {}
| +| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: \{\}
| | `sessEvictRate` _integer_ | SessEvictRate represents the source node session evacuation rate per second.
same to sess-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 500. | 500 | | | `waitTakeover` _integer_ | WaitTakeover represents the time in seconds to wait for a client to
reconnect to take over the session after all connections are disconnected.
same to wait-takeover in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | | `waitHealthCheck` _integer_ | WaitHealthCheck represents the time (in seconds) to wait for the LB to
remove the source node from the list of active backend nodes. After the
specified waiting time is exceeded,the rebalancing task will start.
same to wait-health-check in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | diff --git a/docs/en_US/reference/v2alpha1-reference.md b/docs/en_US/reference/v2alpha1-reference.md index fb7ca69dc..2c8eca77a 100644 --- a/docs/en_US/reference/v2alpha1-reference.md +++ b/docs/en_US/reference/v2alpha1-reference.md @@ -63,6 +63,12 @@ _Underlying type:_ _string_ _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `Creating` | | +| `CoreNodesUpdating` | | +| `CoreNodesReady` | | +| `Running` | | #### EMQX diff --git a/docs/en_US/reference/v2beta1-reference.md b/docs/en_US/reference/v2beta1-reference.md index 8383b9312..7d4f344f7 100644 --- a/docs/en_US/reference/v2beta1-reference.md +++ b/docs/en_US/reference/v2beta1-reference.md @@ -158,8 +158,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `controllerUID` _[UID](#uid)_ | | | | -| `podUID` _[UID](#uid)_ | | | | +| `controllerUID` _[UID](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#uid-types-pkg)_ | | | | +| `podUID` _[UID](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#uid-types-pkg)_ | | | | | `node` _string_ | EMQX node name, example: emqx@127.0.0.1 | | | | `node_status` _string_ | EMQX node status, example: Running | | | | `otp_release` _string_ | Erlang/OTP version used by EMQX, example: 24.2/12.2 | | | @@ -426,6 +426,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceCondition](#rebalancecondition) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceList @@ -457,6 +462,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceStatus](#rebalancestatus) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceSpec @@ -473,8 +483,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | | `instanceKind` _string_ | InstanceKind is used to distinguish between EMQX and EMQXEnterprise.
When it is set to "EMQX", it means that the EMQX CR is v2beta1,
and when it is set to "EmqxEnterprise", it means that the EmqxEnterprise CR is v1beta4. | EMQX | | -| `instanceName` _string_ | InstanceName represents the name of EMQX CR, just work for EMQX Enterprise | | Required: {}
| -| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: {}
| +| `instanceName` _string_ | InstanceName represents the name of EMQX CR, just work for EMQX Enterprise | | Required: \{\}
| +| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: \{\}
| #### RebalanceState @@ -532,7 +542,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: {}
| +| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: \{\}
| | `sessEvictRate` _integer_ | SessEvictRate represents the source node session evacuation rate per second.
same to sess-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 500. | 500 | | | `waitTakeover` _integer_ | WaitTakeover represents the time in seconds to wait for a client to
reconnect to take over the session after all connections are disconnected.
same to wait-takeover in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | | `waitHealthCheck` _integer_ | WaitHealthCheck represents the time (in seconds) to wait for the LB to
remove the source node from the list of active backend nodes. After the
specified waiting time is exceeded,the rebalancing task will start.
same to wait-health-check in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | diff --git a/docs/zh_CN/reference/v1beta3-reference.md b/docs/zh_CN/reference/v1beta3-reference.md index 17cc4ee71..d34c95966 100644 --- a/docs/zh_CN/reference/v1beta3-reference.md +++ b/docs/zh_CN/reference/v1beta3-reference.md @@ -47,6 +47,10 @@ ConditionType defines the condition that the RF can have _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `PluginInitialized` | | +| `Running` | | @@ -129,8 +133,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `registry` _string_ | Registry will used for EMQX owner image,
like ${registry}/emqx/emqx and ${registry}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | -| `image` _string_ | | | Required: {}
| +| `registry` _string_ | Registry will used for EMQX owner image,
like $\{registry\}/emqx/emqx and $\{registry\}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | +| `image` _string_ | | | Required: \{\}
| | `imagePullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Image pull policy.
One of Always, Never, IfNotPresent.
Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | | | | `username` _string_ | Username for EMQX Dashboard and API | admin | | | `password` _string_ | Password for EMQX Dashboard and API | public | | @@ -197,7 +201,7 @@ _Appears in:_ | --- | --- | --- | --- | | `name` _string_ | | | | | `enable` _boolean_ | | | | -| `configs` _[RawExtension](#rawextension)_ | | | | +| `configs` _[RawExtension](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#rawextension-runtime-pkg)_ | | | | @@ -241,8 +245,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `registry` _string_ | Registry will used for EMQX owner image,
like ${registry}/emqx/emqx-ee and ${registry}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | -| `image` _string_ | | | Required: {}
| +| `registry` _string_ | Registry will used for EMQX owner image,
like $\{registry\}/emqx/emqx-ee and $\{registry\}/emqx/emqx-operator-reloader,
but it will not be used by other images, like sidecar container or else. | | | +| `image` _string_ | | | Required: \{\}
| | `imagePullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Image pull policy.
One of Always, Never, IfNotPresent.
Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | | | | `username` _string_ | Username for EMQX Dashboard and API | admin | | | `password` _string_ | Password for EMQX Dashboard and API | public | | @@ -312,8 +316,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: {}
| -| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: {}
| +| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: \{\}
| +| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: \{\}
| | `config` _object (keys:string, values:string)_ | Config defines the configurations of the EMQX plugins | | | diff --git a/docs/zh_CN/reference/v1beta4-reference.md b/docs/zh_CN/reference/v1beta4-reference.md index 75e72e2e3..d4eb882ff 100644 --- a/docs/zh_CN/reference/v1beta4-reference.md +++ b/docs/zh_CN/reference/v1beta4-reference.md @@ -67,6 +67,10 @@ ConditionType defines the condition that the RF can have _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `Running` | | +| `BlueGreenUpdating` | | @@ -181,7 +185,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `image` _[EmqxImage](#emqximage)_ | Container image.
The image is generated by "${Registry}/${Repository}:${Prefix}${Version}${Suffix}". | | | +| `image` _[EmqxImage](#emqximage)_ | Container image.
The image is generated by "$\{Registry\}/$\{Repository\}:$\{Prefix\}$\{Version\}$\{Suffix\}". | | | | `command` _string array_ | Entrypoint array. Not executed within a shell.
The container image's ENTRYPOINT is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
of whether the variable exists or not. Cannot be updated.
More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell | | | | `args` _string array_ | Arguments to the entrypoint.
The container image's CMD is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
of whether the variable exists or not. Cannot be updated.
More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell | | | | `workingDir` _string_ | Container's working directory.
If not specified, the container runtime's default will be used, which
might be configured in the container image.
Cannot be updated. | | | @@ -325,7 +329,7 @@ _Appears in:_ | --- | --- | --- | --- | | `registry` _string_ | Container image registry | | | | `repository` _string_ | Container image repository
Defaults to "emqx/emqx" if kind is EmqxBroker, or "emqx/emqx-ee" if kind is EmqxEnterprise | | | -| `version` _string_ | Container image tag version, must semver format or "latest" | | Required: {}
| +| `version` _string_ | Container image tag version, must semver format or "latest" | | Required: \{\}
| | `prefix` _string_ | Container image tag prefix, like "v" | | | | `suffix` _string_ | Container image tag suffix, like "-alpine" | | | | `pullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#pullpolicy-v1-core)_ | Container image pull policy.
One of Always, Never, IfNotPresent.
Defaults to IfNotPresent.
Cannot be updated.
More info: https://kubernetes.io/docs/concepts/containers/images#updating-images | IfNotPresent | Enum: [Always Never IfNotPresent]
| @@ -401,8 +405,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: {}
| -| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: {}
| +| `pluginName` _string_ | More info: https://www.emqx.io/docs/en/v4.4/advanced/plugins.html#list-of-plugins | | Required: \{\}
| +| `selector` _object (keys:string, values:string)_ | Selector matches the labels of the EMQX | | Required: \{\}
| | `config` _object (keys:string, values:string)_ | Config defines the configurations of the EMQX plugins | | | @@ -530,6 +534,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceCondition](#rebalancecondition) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceList @@ -561,6 +570,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceStatus](#rebalancestatus) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceSpec @@ -576,8 +590,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `instanceName` _string_ | InstanceName represents the name of EmqxEnterprise CR | | Required: {}
| -| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: {}
| +| `instanceName` _string_ | InstanceName represents the name of EmqxEnterprise CR | | Required: \{\}
| +| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: \{\}
| #### RebalanceState @@ -635,7 +649,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: {}
| +| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: \{\}
| | `sessEvictRate` _integer_ | SessEvictRate represents the source node session evacuation rate per second.
same to sess-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 500. | 500 | | | `waitTakeover` _integer_ | WaitTakeover represents the time in seconds to wait for a client to
reconnect to take over the session after all connections are disconnected.
same to wait-takeover in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | | `waitHealthCheck` _integer_ | WaitHealthCheck represents the time (in seconds) to wait for the LB to
remove the source node from the list of active backend nodes. After the
specified waiting time is exceeded,the rebalancing task will start.
same to wait-health-check in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | diff --git a/docs/zh_CN/reference/v2alpha1-reference.md b/docs/zh_CN/reference/v2alpha1-reference.md index fb7ca69dc..2c8eca77a 100644 --- a/docs/zh_CN/reference/v2alpha1-reference.md +++ b/docs/zh_CN/reference/v2alpha1-reference.md @@ -63,6 +63,12 @@ _Underlying type:_ _string_ _Appears in:_ - [Condition](#condition) +| Field | Description | +| --- | --- | +| `Creating` | | +| `CoreNodesUpdating` | | +| `CoreNodesReady` | | +| `Running` | | #### EMQX diff --git a/docs/zh_CN/reference/v2beta1-reference.md b/docs/zh_CN/reference/v2beta1-reference.md index 8383b9312..7d4f344f7 100644 --- a/docs/zh_CN/reference/v2beta1-reference.md +++ b/docs/zh_CN/reference/v2beta1-reference.md @@ -158,8 +158,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `controllerUID` _[UID](#uid)_ | | | | -| `podUID` _[UID](#uid)_ | | | | +| `controllerUID` _[UID](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#uid-types-pkg)_ | | | | +| `podUID` _[UID](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#uid-types-pkg)_ | | | | | `node` _string_ | EMQX node name, example: emqx@127.0.0.1 | | | | `node_status` _string_ | EMQX node status, example: Running | | | | `otp_release` _string_ | Erlang/OTP version used by EMQX, example: 24.2/12.2 | | | @@ -426,6 +426,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceCondition](#rebalancecondition) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceList @@ -457,6 +462,11 @@ _Underlying type:_ _string_ _Appears in:_ - [RebalanceStatus](#rebalancestatus) +| Field | Description | +| --- | --- | +| `Processing` | | +| `Completed` | | +| `Failed` | | #### RebalanceSpec @@ -473,8 +483,8 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | | `instanceKind` _string_ | InstanceKind is used to distinguish between EMQX and EMQXEnterprise.
When it is set to "EMQX", it means that the EMQX CR is v2beta1,
and when it is set to "EmqxEnterprise", it means that the EmqxEnterprise CR is v1beta4. | EMQX | | -| `instanceName` _string_ | InstanceName represents the name of EMQX CR, just work for EMQX Enterprise | | Required: {}
| -| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: {}
| +| `instanceName` _string_ | InstanceName represents the name of EMQX CR, just work for EMQX Enterprise | | Required: \{\}
| +| `rebalanceStrategy` _[RebalanceStrategy](#rebalancestrategy)_ | RebalanceStrategy represents the strategy of EMQX rebalancing
More info: https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing | | Required: \{\}
| #### RebalanceState @@ -532,7 +542,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: {}
| +| `connEvictRate` _integer_ | ConnEvictRate represents the source node client disconnect rate per second.
same to conn-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0 | | Minimum: 1
Required: \{\}
| | `sessEvictRate` _integer_ | SessEvictRate represents the source node session evacuation rate per second.
same to sess-evict-rate in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 500. | 500 | | | `waitTakeover` _integer_ | WaitTakeover represents the time in seconds to wait for a client to
reconnect to take over the session after all connections are disconnected.
same to wait-takeover in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | | `waitHealthCheck` _integer_ | WaitHealthCheck represents the time (in seconds) to wait for the LB to
remove the source node from the list of active backend nodes. After the
specified waiting time is exceeded,the rebalancing task will start.
same to wait-health-check in [EMQX Rebalancing](https://docs.emqx.com/en/enterprise/v4.4/advanced/rebalancing.html#rebalancing)
The value must be greater than 0
Defaults to 60 seconds. | 60 | | diff --git a/e2e/v2beta1/e2e_test.go b/e2e/v2beta1/e2e_test.go index 11329bf9d..255550383 100644 --- a/e2e/v2beta1/e2e_test.go +++ b/e2e/v2beta1/e2e_test.go @@ -513,7 +513,7 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(instance), instance); err != nil { return err } - instance.Spec.Image = "emqx/emqx:latest" + instance.Spec.Image = "emqx/emqx-enterprise:latest" return k8sClient.Update(ctx, instance) })).Should(Succeed()) diff --git a/go.mod b/go.mod index c8b089a44..b91b4ba54 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,13 @@ module github.com/emqx/emqx-operator -go 1.21 - -toolchain go1.21.3 +go 1.22 require ( emperror.dev/errors v0.8.1 github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/json-iterator/go v1.1.12 - github.com/onsi/ginkgo/v2 v2.17.1 - github.com/onsi/gomega v1.30.0 + github.com/onsi/ginkgo/v2 v2.20.2 + github.com/onsi/gomega v1.34.2 github.com/stretchr/testify v1.8.4 github.com/tidwall/gjson v1.14.2 github.com/tidwall/sjson v1.2.5 @@ -29,11 +27,15 @@ require ( require ( github.com/evanphx/json-patch/v5 v5.8.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect + github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/tools v0.20.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/tools v0.24.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) require ( @@ -42,7 +44,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/go-logr/logr v1.4.1 + github.com/go-logr/logr v1.4.2 github.com/go-logr/zapr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect @@ -71,15 +73,15 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.24.0 + golang.org/x/net v0.28.0 golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 1c90f69f3..3e8e597c9 100644 --- a/go.sum +++ b/go.sum @@ -6,9 +6,6 @@ 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/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/cisco-open/k8s-objectmatcher v1.9.0 h1:/sfuO0BD09fpynZjXsqeZrh28Juc4VEwc2P6Ov/Q6fM= github.com/cisco-open/k8s-objectmatcher v1.9.0/go.mod h1:CH4E6qAK+q+JwKFJn0DaTNqxrbmWCaDQzGthKLK4nZ0= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -21,11 +18,13 @@ github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCv github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -34,18 +33,31 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +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.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +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.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -53,11 +65,11 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.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/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= 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/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -84,10 +96,21 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= +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.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= 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= @@ -112,6 +135,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.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.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -139,43 +163,52 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= 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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +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.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= 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= @@ -184,16 +217,28 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= 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/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/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/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.2.2/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.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=