commit
ec6e091fc1
12
Makefile
12
Makefile
|
@ -30,13 +30,13 @@ HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr
|
||||||
OPENSHIFT_VERSIONS ?= v4.12
|
OPENSHIFT_VERSIONS ?= v4.12
|
||||||
|
|
||||||
## Tool Versions
|
## Tool Versions
|
||||||
CODEGEN_VERSION ?= v0.30.0
|
CODEGEN_VERSION ?= v0.30.3
|
||||||
KUSTOMIZE_VERSION ?= v5.4.2
|
KUSTOMIZE_VERSION ?= v5.4.2
|
||||||
CONTROLLER_TOOLS_VERSION ?= v0.15.0
|
CONTROLLER_TOOLS_VERSION ?= v0.16.0
|
||||||
KIND_VERSION ?= v0.22.0
|
KIND_VERSION ?= v0.23.0
|
||||||
LINTER_VERSION ?= v1.59.0
|
LINTER_VERSION ?= v1.59.1
|
||||||
OPERATOR_SDK_VERSION ?= v1.34.2
|
OPERATOR_SDK_VERSION ?= v1.36.1
|
||||||
OPM_VERSION ?= v1.43.1
|
OPM_VERSION ?= v1.45.0
|
||||||
GOVULNCHECK_VERSION ?= latest
|
GOVULNCHECK_VERSION ?= latest
|
||||||
KO_VERSION ?= latest
|
KO_VERSION ?= latest
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ limitations under the License.
|
||||||
package v1alpha1
|
package v1alpha1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
"k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
runtime "k8s.io/apimachinery/pkg/runtime"
|
runtime "k8s.io/apimachinery/pkg/runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.16.0
|
||||||
name: daprcontrolplanes.operator.dapr.io
|
name: daprcontrolplanes.operator.dapr.io
|
||||||
spec:
|
spec:
|
||||||
group: operator.dapr.io
|
group: operator.dapr.io
|
||||||
|
@ -84,16 +84,8 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
conditions:
|
conditions:
|
||||||
items:
|
items:
|
||||||
description: "Condition contains details for one aspect of the current
|
description: Condition contains details for one aspect of the current
|
||||||
state of this API Resource.\n---\nThis struct is intended for
|
state of this API Resource.
|
||||||
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}"
|
|
||||||
properties:
|
properties:
|
||||||
lastTransitionTime:
|
lastTransitionTime:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -134,12 +126,7 @@ spec:
|
||||||
- Unknown
|
- Unknown
|
||||||
type: string
|
type: string
|
||||||
type:
|
type:
|
||||||
description: |-
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
||||||
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)
|
|
||||||
maxLength: 316
|
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])$
|
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
|
type: string
|
||||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.16.0
|
||||||
name: daprcruiscontrols.operator.dapr.io
|
name: daprcruiscontrols.operator.dapr.io
|
||||||
spec:
|
spec:
|
||||||
group: operator.dapr.io
|
group: operator.dapr.io
|
||||||
|
@ -78,16 +78,8 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
conditions:
|
conditions:
|
||||||
items:
|
items:
|
||||||
description: "Condition contains details for one aspect of the current
|
description: Condition contains details for one aspect of the current
|
||||||
state of this API Resource.\n---\nThis struct is intended for
|
state of this API Resource.
|
||||||
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}"
|
|
||||||
properties:
|
properties:
|
||||||
lastTransitionTime:
|
lastTransitionTime:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -128,12 +120,7 @@ spec:
|
||||||
- Unknown
|
- Unknown
|
||||||
type: string
|
type: string
|
||||||
type:
|
type:
|
||||||
description: |-
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
||||||
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)
|
|
||||||
maxLength: 316
|
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])$
|
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
|
type: string
|
||||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.15.0
|
controller-gen.kubebuilder.io/version: v0.16.0
|
||||||
name: daprinstances.operator.dapr.io
|
name: daprinstances.operator.dapr.io
|
||||||
spec:
|
spec:
|
||||||
group: operator.dapr.io
|
group: operator.dapr.io
|
||||||
|
@ -97,16 +97,8 @@ spec:
|
||||||
type: object
|
type: object
|
||||||
conditions:
|
conditions:
|
||||||
items:
|
items:
|
||||||
description: "Condition contains details for one aspect of the current
|
description: Condition contains details for one aspect of the current
|
||||||
state of this API Resource.\n---\nThis struct is intended for
|
state of this API Resource.
|
||||||
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}"
|
|
||||||
properties:
|
properties:
|
||||||
lastTransitionTime:
|
lastTransitionTime:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -147,12 +139,7 @@ spec:
|
||||||
- Unknown
|
- Unknown
|
||||||
type: string
|
type: string
|
||||||
type:
|
type:
|
||||||
description: |-
|
description: type of condition in CamelCase or in foo.example.com/CamelCase.
|
||||||
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)
|
|
||||||
maxLength: 316
|
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])$
|
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
|
type: string
|
||||||
|
|
|
@ -8,29 +8,9 @@ rules:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- configmaps
|
- configmaps
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- events
|
- events
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- secrets
|
- secrets
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- serviceaccounts
|
- serviceaccounts
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- services
|
- services
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
- '*'
|
||||||
|
@ -54,11 +34,6 @@ rules:
|
||||||
- apps
|
- apps
|
||||||
resources:
|
resources:
|
||||||
- deployments
|
- deployments
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- statefulsets
|
- statefulsets
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
- '*'
|
||||||
|
@ -66,71 +41,16 @@ rules:
|
||||||
- dapr.io
|
- dapr.io
|
||||||
resources:
|
resources:
|
||||||
- components
|
- components
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- components/finalizers
|
- components/finalizers
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- components/status
|
- components/status
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- configurations
|
- configurations
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- configurations/finalizers
|
- configurations/finalizers
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- configurations/status
|
- configurations/status
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- resiliencies
|
- resiliencies
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- resiliencies/finalizers
|
- resiliencies/finalizers
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- resiliencies/status
|
- resiliencies/status
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- subscriptions
|
- subscriptions
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- subscriptions/finalizers
|
- subscriptions/finalizers
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- dapr.io
|
|
||||||
resources:
|
|
||||||
- subscriptions/status
|
- subscriptions/status
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
- '*'
|
||||||
|
@ -138,31 +58,6 @@ rules:
|
||||||
- operator.dapr.io
|
- operator.dapr.io
|
||||||
resources:
|
resources:
|
||||||
- daprcontrolplanes
|
- 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
|
- daprinstances
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
|
@ -175,12 +70,14 @@ rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- operator.dapr.io
|
- operator.dapr.io
|
||||||
resources:
|
resources:
|
||||||
|
- daprcontrolplanes/finalizers
|
||||||
- daprinstances/finalizers
|
- daprinstances/finalizers
|
||||||
verbs:
|
verbs:
|
||||||
- update
|
- update
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- operator.dapr.io
|
- operator.dapr.io
|
||||||
resources:
|
resources:
|
||||||
|
- daprcontrolplanes/status
|
||||||
- daprinstances/status
|
- daprinstances/status
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
|
@ -190,23 +87,8 @@ rules:
|
||||||
- rbac.authorization.k8s.io
|
- rbac.authorization.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- clusterrolebindings
|
- clusterrolebindings
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- rbac.authorization.k8s.io
|
|
||||||
resources:
|
|
||||||
- clusterroles
|
- clusterroles
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- rbac.authorization.k8s.io
|
|
||||||
resources:
|
|
||||||
- rolebindings
|
- rolebindings
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- rbac.authorization.k8s.io
|
|
||||||
resources:
|
|
||||||
- roles
|
- roles
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
- '*'
|
||||||
|
|
Loading…
Reference in New Issue