Skip to content

Commit 3f0138e

Browse files
bakitobakito
committed
crd v1
1 parent 5bec81f commit 3f0138e

File tree

2 files changed

+141
-141
lines changed

2 files changed

+141
-141
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
5-
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1beta1"
5+
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -108,4 +108,4 @@ goreleaser: ## Download goreleaser locally if necessary.
108108

109109
MOCKGEN = ./bin/mockgen
110110
mockgen: ## Download mockgen locally if necessary.
111-
$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/[email protected])
111+
$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/[email protected])

‎helm/crds/eventlogger.bakito.ch_eventloggers.yaml‎

Lines changed: 139 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
---
3-
apiVersion: apiextensions.k8s.io/v1beta1
3+
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
@@ -15,150 +15,150 @@ spec:
1515
plural: eventloggers
1616
singular: eventlogger
1717
scope: Namespaced
18-
validation:
19-
openAPIV3Schema:
20-
description: EventLogger is the Schema for the eventloggers API
21-
properties:
22-
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
26-
type: string
27-
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31-
type: string
32-
metadata:
33-
type: object
34-
spec:
35-
description: EventLoggerSpec defines the desired state of EventLogger
36-
properties:
37-
annotations:
38-
additionalProperties:
39-
type: string
40-
description: Labels additional annotations for the logger pod
41-
type: object
42-
eventTypes:
43-
description: EventTypes the event types to log. If empty all events
44-
are logged.
45-
items:
46-
type: string
47-
minItems: 0
48-
type: array
49-
kinds:
50-
description: Kinds the kinds to log the events for
51-
items:
52-
description: Kind defines a kind to log events for
53-
properties:
54-
apiGroup:
55-
nullable: true
56-
type: string
57-
eventTypes:
58-
description: EventTypes the event types to log. If empty events
59-
are logged as defined in spec.
60-
items:
61-
type: string
62-
minItems: 0
63-
type: array
64-
matchingPatterns:
65-
description: MatchingPatterns optional regex pattern that must
66-
be contained in the message to be logged
67-
items:
18+
versions:
19+
- name: v1
20+
schema:
21+
openAPIV3Schema:
22+
description: EventLogger is the Schema for the eventloggers API
23+
properties:
24+
apiVersion:
25+
description: 'APIVersion defines the versioned schema of this representation
26+
of an object. Servers should convert recognized schemas to the latest
27+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
type: string
29+
kind:
30+
description: 'Kind is a string value representing the REST resource this
31+
object represents. Servers may infer this from the endpoint the client
32+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
33+
type: string
34+
metadata:
35+
type: object
36+
spec:
37+
description: EventLoggerSpec defines the desired state of EventLogger
38+
properties:
39+
annotations:
40+
additionalProperties:
41+
type: string
42+
description: Labels additional annotations for the logger pod
43+
type: object
44+
eventTypes:
45+
description: EventTypes the event types to log. If empty all events
46+
are logged.
47+
items:
48+
type: string
49+
minItems: 0
50+
type: array
51+
kinds:
52+
description: Kinds the kinds to log the events for
53+
items:
54+
description: Kind defines a kind to log events for
55+
properties:
56+
apiGroup:
57+
nullable: true
6858
type: string
69-
minItems: 0
70-
type: array
71-
name:
72-
minLength: 3
73-
type: string
74-
reasons:
75-
description: Reasons the event reasons to log. If empty events
76-
with any reasons are logged.
77-
items:
59+
eventTypes:
60+
description: EventTypes the event types to log. If empty events
61+
are logged as defined in spec.
62+
items:
63+
type: string
64+
minItems: 0
65+
type: array
66+
matchingPatterns:
67+
description: MatchingPatterns optional regex pattern that must
68+
be contained in the message to be logged
69+
items:
70+
type: string
71+
minItems: 0
72+
type: array
73+
name:
74+
minLength: 3
7875
type: string
79-
minItems: 0
80-
type: array
81-
skipOnMatch:
82-
description: SkipOnMatch skip the entry if matched
83-
type: boolean
84-
required:
85-
- name
76+
reasons:
77+
description: Reasons the event reasons to log. If empty events
78+
with any reasons are logged.
79+
items:
80+
type: string
81+
minItems: 0
82+
type: array
83+
skipOnMatch:
84+
description: SkipOnMatch skip the entry if matched
85+
type: boolean
86+
required:
87+
- name
88+
type: object
89+
minItems: 1
90+
type: array
91+
labels:
92+
additionalProperties:
93+
type: string
94+
description: Labels additional labels for the logger pod
8695
type: object
87-
minItems: 1
88-
type: array
89-
labels:
90-
additionalProperties:
91-
type: string
92-
description: Labels additional labels for the logger pod
93-
type: object
94-
logFields:
95-
description: LogFields fields ot the event to be logged.
96-
items:
97-
description: LogField defines a log field
98-
properties:
99-
name:
100-
description: name of the log field
101-
type: string
102-
path:
103-
description: Path within the corev1.Event struct https://github.com/kubernetes/api/blob/master/core/v1/types.go
104-
items:
96+
logFields:
97+
description: LogFields fields ot the event to be logged.
98+
items:
99+
description: LogField defines a log field
100+
properties:
101+
name:
102+
description: name of the log field
103+
type: string
104+
path:
105+
description: Path within the corev1.Event struct https://github.com/kubernetes/api/blob/master/core/v1/types.go
106+
items:
107+
type: string
108+
minItems: 1
109+
type: array
110+
value:
111+
description: Value a static value of the log field. Can be uses
112+
to add static log fields
113+
nullable: true
105114
type: string
106-
minItems: 1
107-
type: array
108-
value:
109-
description: Value a static value of the log field. Can be uses
110-
to add static log fields
111-
nullable: true
112-
type: string
113-
required:
114-
- name
115+
required:
116+
- name
117+
type: object
118+
type: array
119+
namespace:
120+
description: namespace the namespace to watch on, may be an empty
121+
string
122+
nullable: true
123+
type: string
124+
nodeSelector:
125+
additionalProperties:
126+
type: string
127+
description: 'NodeSelector is a selector which must be true for the
128+
pod to fit on a node. Selector which must match a node''s labels
129+
for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
115130
type: object
116-
type: array
117-
namespace:
118-
description: namespace the namespace to watch on, may be an empty string
119-
nullable: true
120-
type: string
121-
nodeSelector:
122-
additionalProperties:
131+
scrapeMetrics:
132+
description: ScrapeMetrics if true, prometheus scrape annotations
133+
are added to the pod
134+
type: boolean
135+
serviceAccount:
136+
description: ServiceAccount the service account to use for the logger
137+
pod
123138
type: string
124-
description: 'NodeSelector is a selector which must be true for the
125-
pod to fit on a node. Selector which must match a node''s labels for
126-
the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/'
127-
type: object
128-
scrapeMetrics:
129-
description: ScrapeMetrics if true, prometheus scrape annotations are
130-
added to the pod
131-
type: boolean
132-
serviceAccount:
133-
description: ServiceAccount the service account to use for the logger
134-
pod
135-
type: string
136-
type: object
137-
status:
138-
description: EventLoggerStatus defines the observed state of EventLogger
139-
properties:
140-
error:
141-
description: Error
142-
type: string
143-
hash:
144-
description: Hash
145-
type: string
146-
lastProcessed:
147-
description: LastProcessed the timestamp the cr was last processed
148-
format: date-time
149-
type: string
150-
operatorVersion:
151-
description: OperatorVersion the version of the operator that processed
152-
the cr
153-
type: string
154-
required:
155-
- lastProcessed
156-
- operatorVersion
157-
type: object
158-
type: object
159-
version: v1
160-
versions:
161-
- name: v1
139+
type: object
140+
status:
141+
description: EventLoggerStatus defines the observed state of EventLogger
142+
properties:
143+
error:
144+
description: Error
145+
type: string
146+
hash:
147+
description: Hash
148+
type: string
149+
lastProcessed:
150+
description: LastProcessed the timestamp the cr was last processed
151+
format: date-time
152+
type: string
153+
operatorVersion:
154+
description: OperatorVersion the version of the operator that processed
155+
the cr
156+
type: string
157+
required:
158+
- lastProcessed
159+
- operatorVersion
160+
type: object
161+
type: object
162162
served: true
163163
storage: true
164164
status:

0 commit comments

Comments
 (0)