Skip to content

Commit b1bb919

Browse files
antweissEItanya
authored andcommitted
Update CRD definitions for agentRef
Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io>
1 parent a49f684 commit b1bb919

File tree

3 files changed

+45
-13
lines changed

3 files changed

+45
-13
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ test: fmt vet ## Run tests.
7575
build: fmt vet ## Build manager binary.
7676
go build -o bin/manager cmd/main.go
7777

78+
.PHONY: generate
79+
generate: ## Generate code and manifests (CRDs, RBAC, webhooks)
80+
$(shell go env GOPATH)/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
81+
$(shell go env GOPATH)/bin/controller-gen crd:allowDangerousTypes=true paths="./api/..." output:crd:artifacts:config=config/crd/bases
82+
cp config/crd/bases/kagent.dev_hooks.yaml helm/khook-crds/crds/kagent.dev_hooks.yaml
83+
7884
.PHONY: run
7985
run: fmt vet ## Run a controller from your host.
8086
go run ./cmd/main.go
@@ -137,7 +143,7 @@ helm-version:
137143
helm package -d $(HELM_DIST_FOLDER) helm/khook-crds
138144
helm package -d $(HELM_DIST_FOLDER) helm/khook
139145

140-
.PHONY: helm-publish
146+
.PHONY: helm-publish
141147
helm-publish: helm-version
142148
helm push ./$(HELM_DIST_FOLDER)/khook-crds-$(VERSION).tgz $(HELM_REPO)/khook/helm
143149
helm push ./$(HELM_DIST_FOLDER)/khook-$(VERSION).tgz $(HELM_REPO)/khook/helm

config/crd/bases/kagent.dev_hooks.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: hooks.kagent.dev
88
spec:
99
group: kagent.dev
@@ -45,11 +45,24 @@ spec:
4545
items:
4646
description: EventConfiguration defines a single event type configuration
4747
properties:
48-
agentId:
49-
description: AgentId specifies the Kagent agent to call when
48+
agentRef:
49+
description: AgentRef specifies the Kagent agent to call when
5050
this event occurs
51-
minLength: 1
52-
type: string
51+
properties:
52+
name:
53+
description: |-
54+
Name of the referent.
55+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
56+
minLength: 1
57+
type: string
58+
namespace:
59+
description: |-
60+
Namespace of the referent.
61+
If unspecified, the namespace of the Hook will be used.
62+
type: string
63+
required:
64+
- name
65+
type: object
5366
eventType:
5467
description: EventType specifies the type of Kubernetes event
5568
to monitor
@@ -65,7 +78,7 @@ spec:
6578
minLength: 1
6679
type: string
6780
required:
68-
- agentId
81+
- agentRef
6982
- eventType
7083
- prompt
7184
type: object

helm/khook-crds/crds/kagent.dev_hooks.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: hooks.kagent.dev
88
spec:
99
group: kagent.dev
@@ -45,11 +45,24 @@ spec:
4545
items:
4646
description: EventConfiguration defines a single event type configuration
4747
properties:
48-
agentId:
49-
description: AgentId specifies the Kagent agent to call when
48+
agentRef:
49+
description: AgentRef specifies the Kagent agent to call when
5050
this event occurs
51-
minLength: 1
52-
type: string
51+
properties:
52+
name:
53+
description: |-
54+
Name of the referent.
55+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
56+
minLength: 1
57+
type: string
58+
namespace:
59+
description: |-
60+
Namespace of the referent.
61+
If unspecified, the namespace of the Hook will be used.
62+
type: string
63+
required:
64+
- name
65+
type: object
5366
eventType:
5467
description: EventType specifies the type of Kubernetes event
5568
to monitor
@@ -65,7 +78,7 @@ spec:
6578
minLength: 1
6679
type: string
6780
required:
68-
- agentId
81+
- agentRef
6982
- eventType
7083
- prompt
7184
type: object

0 commit comments

Comments
 (0)