Skip to content

Commit

Permalink
Merge pull request #209 from rancher/combined-agent
Browse files Browse the repository at this point in the history
Run logging controllers in agent
  • Loading branch information
dbason committed May 11, 2022
2 parents 9e61a50 + c269cad commit a88ab21
Show file tree
Hide file tree
Showing 44 changed files with 62,090 additions and 37,766 deletions.
8 changes: 8 additions & 0 deletions config/agent-chart-crds/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# namespace: opni-system
namePrefix: opni-
bases:
- ../agent-crd

patchesStrategicMerge:
- patches/webhook_in_logadapters.yaml
- patches/cainjection_in_logadapters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: "replace-me/opni-serving-cert"
name: gpupolicyadapters.opni.io
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: "replace-me/opni-serving-cert"
name: logadapters.opni.io
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: "replace-me/opni-serving-cert"
name: opniclusters.opni.io
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: "replace-me/opni-serving-cert"
name: pretrainedmodels.opni.io
17 changes: 17 additions & 0 deletions config/agent-chart-crds/patches/webhook_in_gpupolicyadapters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: gpupolicyadapters.opni.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
namespace: replace-me
name: opni-webhook
path: /convert
conversionReviewVersions:
- v1beta1
- v1beta2
17 changes: 17 additions & 0 deletions config/agent-chart-crds/patches/webhook_in_logadapters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: logadapters.opni.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
namespace: replace-me
name: opni-webhook
path: /convert
conversionReviewVersions:
- v1beta1
- v1beta2
17 changes: 17 additions & 0 deletions config/agent-chart-crds/patches/webhook_in_opniclusters.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: opniclusters.opni.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
namespace: replace-me
name: opni-webhook
path: /convert
conversionReviewVersions:
- v1beta1
- v1beta2
17 changes: 17 additions & 0 deletions config/agent-chart-crds/patches/webhook_in_pretrainedmodels.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: pretrainedmodels.opni.io
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
namespace: replace-me
name: opni-webhook
path: /convert
conversionReviewVersions:
- v1beta1
- v1beta2
65 changes: 65 additions & 0 deletions config/agent-crd/bases/opni.io_bootstraptokens.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.1-0.20220428122951-32ad71090a62
creationTimestamp: null
name: bootstraptokens.opni.io
spec:
group: opni.io
names:
kind: BootstrapToken
listKind: BootstrapTokenList
plural: bootstraptokens
singular: bootstraptoken
scope: Namespaced
versions:
- name: v1beta2
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
metadata:
properties:
capabilities:
items:
properties:
reference:
properties:
id:
type: string
type: object
type:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
type: object
leaseID:
format: int64
type: integer
ttl:
format: int64
type: integer
usageCount:
format: int64
type: integer
type: object
secret:
type: string
tokenID:
type: string
type: object
type: object
served: true
storage: true
106 changes: 106 additions & 0 deletions config/agent-crd/bases/opni.io_datapreppers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.1-0.20220428122951-32ad71090a62
creationTimestamp: null
name: datapreppers.opni.io
spec:
group: opni.io
names:
kind: DataPrepper
listKind: DataPrepperList
plural: datapreppers
singular: dataprepper
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1beta2
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
kind:
type: string
metadata:
type: object
spec:
properties:
cluster:
type: string
defaultRepo:
type: string
image:
type: string
imagePullPolicy:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
nodeSelector:
additionalProperties:
type: string
type: object
opensearch:
properties:
endpoint:
type: string
insecureDisableSSLVerify:
type: boolean
type: object
passwordFrom:
properties:
key:
type: string
name:
type: string
optional:
type: boolean
required:
- key
type: object
tolerations:
items:
properties:
effect:
type: string
key:
type: string
operator:
type: string
tolerationSeconds:
format: int64
type: integer
value:
type: string
type: object
type: array
username:
type: string
version:
default: latest
type: string
type: object
status:
properties:
conditions:
items:
type: string
type: array
state:
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
33 changes: 33 additions & 0 deletions config/agent-crd/bases/opni.io_keyrings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.1-0.20220428122951-32ad71090a62
creationTimestamp: null
name: keyrings.opni.io
spec:
group: opni.io
names:
kind: Keyring
listKind: KeyringList
plural: keyrings
singular: keyring
scope: Namespaced
versions:
- name: v1beta2
schema:
openAPIV3Schema:
properties:
apiVersion:
type: string
data:
format: byte
type: string
kind:
type: string
metadata:
type: object
type: object
served: true
storage: true

0 comments on commit a88ab21

Please sign in to comment.