diff --git a/.circleci/config.yml b/.circleci/config.yml index 977a925e90e..3c150ed7dba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: build: docker: # specify the version - - image: cimg/go:1.23.7 + - image: cimg/go:1.24.8 working_directory: ~/project/src/github.com/fluid-cloudnative/fluid environment: TEST_FLAGS: '-race -coverprofile=coverage.txt -covermode=atomic' diff --git a/.github/workflows/kind-e2e.yml b/.github/workflows/kind-e2e.yml index a6c6a64f6c6..8629fa09d99 100644 --- a/.github/workflows/kind-e2e.yml +++ b/.github/workflows/kind-e2e.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true env: - GO_VERSION: 1.23.7 + GO_VERSION: 1.24.8 jobs: kind-e2e-test: diff --git a/.github/workflows/project-check.yml b/.github/workflows/project-check.yml index 6b11db499d9..a8f2e9d8ad9 100644 --- a/.github/workflows/project-check.yml +++ b/.github/workflows/project-check.yml @@ -7,7 +7,7 @@ on: branches: [ master, release-* ] env: - GO_VERSION: 1.23.7 + GO_VERSION: 1.24.8 # Declare default permissions as read only. permissions: read-all diff --git a/.travis.yml b/.travis.yml index d81600df112..e8dc59756c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ matrix: include: - language: go go: - - "1.23.7" + - "1.24.8" os: - linux go_import_path: github.com/fluid-cloudnative/fluid diff --git a/Makefile b/Makefile index 74ad449082b..3a919230e1b 100644 --- a/Makefile +++ b/Makefile @@ -445,7 +445,7 @@ ifeq (, $(shell which controller-gen)) cd $$CONTROLLER_GEN_TMP_DIR ;\ export GO111MODULE=on ;\ go mod init tmp ;\ - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0 ;\ rm -rf $$CONTROLLER_GEN_TMP_DIR ;\ } CONTROLLER_GEN=$(GOBIN)/controller-gen diff --git a/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml index 90de3fc4c02..71c2eff0056 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: alluxioruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml b/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml index 70bdd60377a..b9a8f984497 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_databackups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: databackups.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml b/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml index 3cd1cb1983d..f10e5a085f4 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_dataloads.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: dataloads.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml b/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml index 54350a21c39..f27283c65e1 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_datamigrates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: datamigrates.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml b/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml index 582d7749404..6bdfa2b69d6 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_dataprocesses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: dataprocesses.data.fluid.io spec: group: data.fluid.io @@ -708,6 +708,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -812,6 +813,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -997,6 +999,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1368,6 +1371,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1472,6 +1476,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1657,6 +1662,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2035,6 +2041,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2139,6 +2146,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2324,6 +2332,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml b/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml index b86a95a77cc..7dd20501626 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_datasets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: datasets.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml index 1d02a93af19..bd9430b6be0 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: efcruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml index bad317e2b2b..c5f4dd06bf6 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_goosefsruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: goosefsruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml index a6f2bf3a5cf..f98e8093cdd 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_jindoruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: jindoruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml index be08eb68aca..9374a2a8d89 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_juicefsruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: juicefsruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml b/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml index bc16a94b8b4..7924c41dbcc 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: thinruntimeprofiles.data.fluid.io spec: group: data.fluid.io @@ -255,6 +255,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -367,6 +368,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1332,6 +1334,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1440,6 +1443,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml index 29dcb588b0c..1e222aefc16 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_thinruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: thinruntimes.data.fluid.io spec: group: data.fluid.io @@ -255,6 +255,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -367,6 +368,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2137,6 +2139,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2245,6 +2248,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml index 0ac276c2417..5c83fade413 100644 --- a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml +++ b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: vineyardruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_alluxioruntimes.yaml b/config/crd/bases/data.fluid.io_alluxioruntimes.yaml index 90de3fc4c02..71c2eff0056 100644 --- a/config/crd/bases/data.fluid.io_alluxioruntimes.yaml +++ b/config/crd/bases/data.fluid.io_alluxioruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: alluxioruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_databackups.yaml b/config/crd/bases/data.fluid.io_databackups.yaml index 70bdd60377a..b9a8f984497 100644 --- a/config/crd/bases/data.fluid.io_databackups.yaml +++ b/config/crd/bases/data.fluid.io_databackups.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: databackups.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_dataloads.yaml b/config/crd/bases/data.fluid.io_dataloads.yaml index 3cd1cb1983d..f10e5a085f4 100644 --- a/config/crd/bases/data.fluid.io_dataloads.yaml +++ b/config/crd/bases/data.fluid.io_dataloads.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: dataloads.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_datamigrates.yaml b/config/crd/bases/data.fluid.io_datamigrates.yaml index 54350a21c39..f27283c65e1 100644 --- a/config/crd/bases/data.fluid.io_datamigrates.yaml +++ b/config/crd/bases/data.fluid.io_datamigrates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: datamigrates.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_dataprocesses.yaml b/config/crd/bases/data.fluid.io_dataprocesses.yaml index 582d7749404..6bdfa2b69d6 100644 --- a/config/crd/bases/data.fluid.io_dataprocesses.yaml +++ b/config/crd/bases/data.fluid.io_dataprocesses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: dataprocesses.data.fluid.io spec: group: data.fluid.io @@ -708,6 +708,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -812,6 +813,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -997,6 +999,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1368,6 +1371,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1472,6 +1476,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1657,6 +1662,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2035,6 +2041,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2139,6 +2146,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2324,6 +2332,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/data.fluid.io_datasets.yaml b/config/crd/bases/data.fluid.io_datasets.yaml index b86a95a77cc..7dd20501626 100644 --- a/config/crd/bases/data.fluid.io_datasets.yaml +++ b/config/crd/bases/data.fluid.io_datasets.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: datasets.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_efcruntimes.yaml b/config/crd/bases/data.fluid.io_efcruntimes.yaml index 1d02a93af19..bd9430b6be0 100644 --- a/config/crd/bases/data.fluid.io_efcruntimes.yaml +++ b/config/crd/bases/data.fluid.io_efcruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: efcruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_goosefsruntimes.yaml b/config/crd/bases/data.fluid.io_goosefsruntimes.yaml index bad317e2b2b..c5f4dd06bf6 100644 --- a/config/crd/bases/data.fluid.io_goosefsruntimes.yaml +++ b/config/crd/bases/data.fluid.io_goosefsruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: goosefsruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_jindoruntimes.yaml b/config/crd/bases/data.fluid.io_jindoruntimes.yaml index a6f2bf3a5cf..f98e8093cdd 100644 --- a/config/crd/bases/data.fluid.io_jindoruntimes.yaml +++ b/config/crd/bases/data.fluid.io_jindoruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: jindoruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_juicefsruntimes.yaml b/config/crd/bases/data.fluid.io_juicefsruntimes.yaml index be08eb68aca..9374a2a8d89 100644 --- a/config/crd/bases/data.fluid.io_juicefsruntimes.yaml +++ b/config/crd/bases/data.fluid.io_juicefsruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: juicefsruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/crd/bases/data.fluid.io_thinruntimeprofiles.yaml b/config/crd/bases/data.fluid.io_thinruntimeprofiles.yaml index bc16a94b8b4..7924c41dbcc 100644 --- a/config/crd/bases/data.fluid.io_thinruntimeprofiles.yaml +++ b/config/crd/bases/data.fluid.io_thinruntimeprofiles.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: thinruntimeprofiles.data.fluid.io spec: group: data.fluid.io @@ -255,6 +255,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -367,6 +368,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1332,6 +1334,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1440,6 +1443,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/data.fluid.io_thinruntimes.yaml b/config/crd/bases/data.fluid.io_thinruntimes.yaml index 29dcb588b0c..1e222aefc16 100644 --- a/config/crd/bases/data.fluid.io_thinruntimes.yaml +++ b/config/crd/bases/data.fluid.io_thinruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: thinruntimes.data.fluid.io spec: group: data.fluid.io @@ -255,6 +255,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -367,6 +368,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2137,6 +2139,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2245,6 +2248,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/data.fluid.io_vineyardruntimes.yaml b/config/crd/bases/data.fluid.io_vineyardruntimes.yaml index 0ac276c2417..5c83fade413 100644 --- a/config/crd/bases/data.fluid.io_vineyardruntimes.yaml +++ b/config/crd/bases/data.fluid.io_vineyardruntimes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.19.0 name: vineyardruntimes.data.fluid.io spec: group: data.fluid.io diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 71d7693e653..7ad1e647942 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,152 +8,14 @@ rules: - data.fluid.io resources: - alluxioruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - alluxioruntimes/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - dataprocesses - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - dataprocesses/finalizers - verbs: - - update -- apiGroups: - - data.fluid.io - resources: - - dataprocesses/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - datasets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - datasets/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - efcruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - efcruntimes/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - goosefsruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - goosefsruntimes/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - jindoruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - jindoruntimes/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - juicefsruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - juicefsruntimes/status - verbs: - - get - - patch - - update -- apiGroups: - - data.fluid.io - resources: - thinruntimes + - vineyardruntimes verbs: - create - delete @@ -165,13 +27,15 @@ rules: - apiGroups: - data.fluid.io resources: - - thinruntimes/finalizers - verbs: - - update -- apiGroups: - - data.fluid.io - resources: + - alluxioruntimes/status + - dataprocesses/status + - datasets/status + - efcruntimes/status + - goosefsruntimes/status + - jindoruntimes/status + - juicefsruntimes/status - thinruntimes/status + - vineyardruntimes/status verbs: - get - patch @@ -179,20 +43,7 @@ rules: - apiGroups: - data.fluid.io resources: - - vineyardruntimes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - data.fluid.io - resources: - - vineyardruntimes/status + - dataprocesses/finalizers + - thinruntimes/finalizers verbs: - - get - - patch - update diff --git a/docker/Dockerfile.alluxioruntime b/docker/Dockerfile.alluxioruntime index 989fe247b57..0cbb0dba546 100644 --- a/docker/Dockerfile.alluxioruntime +++ b/docker/Dockerfile.alluxioruntime @@ -1,6 +1,6 @@ # Build the alluxioruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.application b/docker/Dockerfile.application index c7b9e9f57cb..019be69161a 100644 --- a/docker/Dockerfile.application +++ b/docker/Dockerfile.application @@ -1,6 +1,6 @@ # Build the fluidapp-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.csi b/docker/Dockerfile.csi index f8b554fde9f..9f8905efeb3 100644 --- a/docker/Dockerfile.csi +++ b/docker/Dockerfile.csi @@ -1,6 +1,6 @@ # Build the csi binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.dataset b/docker/Dockerfile.dataset index 0f30d8e6ad9..fcb358b289a 100644 --- a/docker/Dockerfile.dataset +++ b/docker/Dockerfile.dataset @@ -1,6 +1,6 @@ # Build the dataset-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.efcruntime b/docker/Dockerfile.efcruntime index 34ad72eb727..c9342542a7d 100644 --- a/docker/Dockerfile.efcruntime +++ b/docker/Dockerfile.efcruntime @@ -1,6 +1,6 @@ # Build the efcruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.goosefsruntime b/docker/Dockerfile.goosefsruntime index fee08761741..e3fb2311dee 100644 --- a/docker/Dockerfile.goosefsruntime +++ b/docker/Dockerfile.goosefsruntime @@ -1,6 +1,6 @@ # Build the goosefsruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.jindoruntime b/docker/Dockerfile.jindoruntime index e5d433e5fff..7dd3d035fb7 100644 --- a/docker/Dockerfile.jindoruntime +++ b/docker/Dockerfile.jindoruntime @@ -1,6 +1,6 @@ # Build the jindoruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.juicefsruntime b/docker/Dockerfile.juicefsruntime index 52c6c517d6f..4eceff0cc71 100644 --- a/docker/Dockerfile.juicefsruntime +++ b/docker/Dockerfile.juicefsruntime @@ -1,6 +1,6 @@ # Build the juicefsruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.thinruntime b/docker/Dockerfile.thinruntime index a3709692255..11aa4c4b4ea 100644 --- a/docker/Dockerfile.thinruntime +++ b/docker/Dockerfile.thinruntime @@ -1,6 +1,6 @@ # Build the thinruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.vineyardruntime b/docker/Dockerfile.vineyardruntime index 5a1e3b541cf..d33033fd064 100644 --- a/docker/Dockerfile.vineyardruntime +++ b/docker/Dockerfile.vineyardruntime @@ -1,6 +1,6 @@ # Build the vineyardruntime-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/docker/Dockerfile.webhook b/docker/Dockerfile.webhook index a2c995f3735..ce241a57666 100644 --- a/docker/Dockerfile.webhook +++ b/docker/Dockerfile.webhook @@ -1,6 +1,6 @@ # Build the dataset-controller manager binary -# golang:1.23.10-bullseye -FROM golang:1.23.10-bullseye@sha256:05ed4a0dad540eaf289072132678452ec19fa99481658be4813bff6250fedcee as builder +# golang:1.24.8-bookworm +FROM golang:1.24.8-bookworm@sha256:4ed690d6649d63c312b99a6120025ec79ce3b542968a37da53d6236c7c61a848 as builder WORKDIR /go/src/github.com/fluid-cloudnative/fluid COPY . . diff --git a/go.mod b/go.mod index 6194c405f88..cb71b012d9a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluid-cloudnative/fluid -go 1.23.7 +go 1.24.8 replace k8s.io/api => k8s.io/api v0.29.15