From f62696a807966ebdcbde1d97a755820ff0dacc85 Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:18:50 +0200 Subject: [PATCH 1/6] chore(ci): upgrade golangci-lint to v1.59.1 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7622c30..91e2b42 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ CODEGEN_VERSION ?= v0.30.0 KUSTOMIZE_VERSION ?= v5.4.2 CONTROLLER_TOOLS_VERSION ?= v0.15.0 KIND_VERSION ?= v0.22.0 -LINTER_VERSION ?= v1.59.0 +LINTER_VERSION ?= v1.59.1 OPERATOR_SDK_VERSION ?= v1.34.2 OPM_VERSION ?= v1.43.1 GOVULNCHECK_VERSION ?= latest From 6f1a09504d5475a728a4037c84f00e90539c3510 Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:19:59 +0200 Subject: [PATCH 2/6] chore(ci): upgrade kubernetes/code-generator to v0.30.3 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91e2b42..9757ead 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr OPENSHIFT_VERSIONS ?= v4.12 ## Tool Versions -CODEGEN_VERSION ?= v0.30.0 +CODEGEN_VERSION ?= v0.30.3 KUSTOMIZE_VERSION ?= v5.4.2 CONTROLLER_TOOLS_VERSION ?= v0.15.0 KIND_VERSION ?= v0.22.0 From 61d1007dae1caa276eeb9d967ed9e1f921afb177 Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:23:14 +0200 Subject: [PATCH 3/6] chore(ci): upgrade kubernetes-sigs/controller-tools to v0.16.0 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../operator.dapr.io_daprcontrolplanes.yaml | 21 +-- .../operator.dapr.io_daprcruiscontrols.yaml | 21 +-- .../bases/operator.dapr.io_daprinstances.yaml | 21 +-- config/rbac/role.yaml | 122 +----------------- 6 files changed, 16 insertions(+), 173 deletions(-) diff --git a/Makefile b/Makefile index 9757ead..376628d 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ OPENSHIFT_VERSIONS ?= v4.12 ## Tool Versions CODEGEN_VERSION ?= v0.30.3 KUSTOMIZE_VERSION ?= v5.4.2 -CONTROLLER_TOOLS_VERSION ?= v0.15.0 +CONTROLLER_TOOLS_VERSION ?= v0.16.0 KIND_VERSION ?= v0.22.0 LINTER_VERSION ?= v1.59.1 OPERATOR_SDK_VERSION ?= v1.34.2 diff --git a/api/operator/v1alpha1/zz_generated.deepcopy.go b/api/operator/v1alpha1/zz_generated.deepcopy.go index 5dcc7d3..b1d21c0 100644 --- a/api/operator/v1alpha1/zz_generated.deepcopy.go +++ b/api/operator/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/config/crd/bases/operator.dapr.io_daprcontrolplanes.yaml b/config/crd/bases/operator.dapr.io_daprcontrolplanes.yaml index ce2e934..f1b9ead 100644 --- a/config/crd/bases/operator.dapr.io_daprcontrolplanes.yaml +++ b/config/crd/bases/operator.dapr.io_daprcontrolplanes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.0 name: daprcontrolplanes.operator.dapr.io spec: group: operator.dapr.io @@ -84,16 +84,8 @@ spec: type: object conditions: items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -134,12 +126,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/crd/bases/operator.dapr.io_daprcruiscontrols.yaml b/config/crd/bases/operator.dapr.io_daprcruiscontrols.yaml index aadf966..f0b3bf5 100644 --- a/config/crd/bases/operator.dapr.io_daprcruiscontrols.yaml +++ b/config/crd/bases/operator.dapr.io_daprcruiscontrols.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.0 name: daprcruiscontrols.operator.dapr.io spec: group: operator.dapr.io @@ -78,16 +78,8 @@ spec: type: object conditions: items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -128,12 +120,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/crd/bases/operator.dapr.io_daprinstances.yaml b/config/crd/bases/operator.dapr.io_daprinstances.yaml index 89adb92..0653571 100644 --- a/config/crd/bases/operator.dapr.io_daprinstances.yaml +++ b/config/crd/bases/operator.dapr.io_daprinstances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.0 name: daprinstances.operator.dapr.io spec: group: operator.dapr.io @@ -97,16 +97,8 @@ spec: type: object conditions: items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -147,12 +139,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 8ebaca6..aafd80e 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,29 +8,9 @@ rules: - "" resources: - configmaps - verbs: - - '*' -- apiGroups: - - "" - resources: - events - verbs: - - '*' -- apiGroups: - - "" - resources: - secrets - verbs: - - '*' -- apiGroups: - - "" - resources: - serviceaccounts - verbs: - - '*' -- apiGroups: - - "" - resources: - services verbs: - '*' @@ -54,11 +34,6 @@ rules: - apps resources: - deployments - verbs: - - '*' -- apiGroups: - - apps - resources: - statefulsets verbs: - '*' @@ -66,71 +41,16 @@ rules: - dapr.io resources: - components - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - components/finalizers - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - components/status - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - configurations - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - configurations/finalizers - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - configurations/status - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - resiliencies - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - resiliencies/finalizers - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - resiliencies/status - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - subscriptions - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - subscriptions/finalizers - verbs: - - '*' -- apiGroups: - - dapr.io - resources: - subscriptions/status verbs: - '*' @@ -138,31 +58,6 @@ rules: - operator.dapr.io resources: - daprcontrolplanes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - operator.dapr.io - resources: - - daprcontrolplanes/finalizers - verbs: - - update -- apiGroups: - - operator.dapr.io - resources: - - daprcontrolplanes/status - verbs: - - get - - patch - - update -- apiGroups: - - operator.dapr.io - resources: - daprinstances verbs: - create @@ -175,12 +70,14 @@ rules: - apiGroups: - operator.dapr.io resources: + - daprcontrolplanes/finalizers - daprinstances/finalizers verbs: - update - apiGroups: - operator.dapr.io resources: + - daprcontrolplanes/status - daprinstances/status verbs: - get @@ -190,23 +87,8 @@ rules: - rbac.authorization.k8s.io resources: - clusterrolebindings - verbs: - - '*' -- apiGroups: - - rbac.authorization.k8s.io - resources: - clusterroles - verbs: - - '*' -- apiGroups: - - rbac.authorization.k8s.io - resources: - rolebindings - verbs: - - '*' -- apiGroups: - - rbac.authorization.k8s.io - resources: - roles verbs: - '*' From 7de02b7beea3b930b2f31c7b2edb05d1f2684790 Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:24:23 +0200 Subject: [PATCH 4/6] chore(ci): upgrade kind to v0.23.0 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 376628d..dc38dcb 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ OPENSHIFT_VERSIONS ?= v4.12 CODEGEN_VERSION ?= v0.30.3 KUSTOMIZE_VERSION ?= v5.4.2 CONTROLLER_TOOLS_VERSION ?= v0.16.0 -KIND_VERSION ?= v0.22.0 +KIND_VERSION ?= v0.23.0 LINTER_VERSION ?= v1.59.1 OPERATOR_SDK_VERSION ?= v1.34.2 OPM_VERSION ?= v1.43.1 From f915ab153aba56d871cebb5ffa0062b151e4bbd8 Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:25:17 +0200 Subject: [PATCH 5/6] chore(ci): upgrade operator-sdk to v1.36.1 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc38dcb..b4dc273 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ KUSTOMIZE_VERSION ?= v5.4.2 CONTROLLER_TOOLS_VERSION ?= v0.16.0 KIND_VERSION ?= v0.23.0 LINTER_VERSION ?= v1.59.1 -OPERATOR_SDK_VERSION ?= v1.34.2 +OPERATOR_SDK_VERSION ?= v1.36.1 OPM_VERSION ?= v1.43.1 GOVULNCHECK_VERSION ?= latest KO_VERSION ?= latest From 2c7e5d102ace0a791e4342363c56a452a331dd7c Mon Sep 17 00:00:00 2001 From: Luca Burgazzoli Date: Tue, 13 Aug 2024 23:27:29 +0200 Subject: [PATCH 6/6] chore(ci): upgrade opm to v1.45.0 Signed-off-by: Luca Burgazzoli --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4dc273..c403dbb 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.16.0 KIND_VERSION ?= v0.23.0 LINTER_VERSION ?= v1.59.1 OPERATOR_SDK_VERSION ?= v1.36.1 -OPM_VERSION ?= v1.43.1 +OPM_VERSION ?= v1.45.0 GOVULNCHECK_VERSION ?= latest KO_VERSION ?= latest