Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ARCH ?= $(shell go env GOARCH)
OS ?= $(shell uname -s | tr A-Z a-z)
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v1.0.0
TAG ?= main

## Tool Binaries
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
Expand Down
6 changes: 6 additions & 0 deletions api/v1beta1/eventtrigger_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,18 +239,21 @@ type EventTriggerSpec struct {
// that need to be deployed in the matching clusters based on EventSource.
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
PolicyRefs []configv1beta1.PolicyRef `json:"policyRefs,omitempty"`

// Helm charts to be deployed in the matching clusters based on EventSource.
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
HelmCharts []configv1beta1.HelmChart `json:"helmCharts,omitempty"`

// Kustomization refs
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
KustomizationRefs []configv1beta1.KustomizationRef `json:"kustomizationRefs,omitempty"`

Expand All @@ -259,13 +262,15 @@ type EventTriggerSpec struct {
// is healthy
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
ValidateHealths []libsveltosv1beta1.ValidateHealth `json:"validateHealths,omitempty"`

// Define additional Kustomize inline Patches applied for all resources on this profile
// Within the Patch Spec you can use templating
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
Patches []libsveltosv1beta1.Patch `json:"patches,omitempty"`

Expand All @@ -274,6 +279,7 @@ type EventTriggerSpec struct {
// when evaluating drift, optionally targeting specific resources and features.
// This field will be directly transferred to the ClusterProfile Spec
// generated in response to events.
// +listType=atomic
// +optional
DriftExclusions []libsveltosv1beta1.DriftExclusion `json:"driftExclusions,omitempty"`

Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/lib.projectsveltos.io_eventtriggers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ spec:
- paths
type: object
type: array
x-kubernetes-list-type: atomic
eventSourceName:
description: |-
EventSourceName is the name of the referenced EventSource.
Expand Down Expand Up @@ -694,6 +695,7 @@ spec:
rule: 'self.repositoryURL.startsWith(''oci'') ? size(self.repositoryName)
>= 1 : true'
type: array
x-kubernetes-list-type: atomic
kustomizationRefs:
description: |-
Kustomization refs
Expand Down Expand Up @@ -837,6 +839,7 @@ spec:
- namespace
type: object
type: array
x-kubernetes-list-type: atomic
maxUpdate:
anyOf:
- type: integer
Expand Down Expand Up @@ -927,6 +930,7 @@ spec:
- patch
type: object
type: array
x-kubernetes-list-type: atomic
policyRefs:
description: |-
PolicyRefs references all the ConfigMaps/Secrets containing kubernetes resources
Expand Down Expand Up @@ -988,6 +992,7 @@ spec:
- name
type: object
type: array
x-kubernetes-list-type: atomic
reloader:
default: false
description: |-
Expand Down Expand Up @@ -1300,6 +1305,7 @@ spec:
- version
type: object
type: array
x-kubernetes-list-type: atomic
required:
- eventSourceName
- sourceClusterSelector
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ spec:
- "--shard-key="
- "--capi-onboard-annotation="
- "--v=5"
- "--version=v1.0.0"
- "--version=main"
- "--agent-in-mgmt-cluster=false"
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: docker.io/projectsveltos/event-manager:v1.0.0
- image: docker.io/projectsveltos/event-manager:main
name: manager
6 changes: 5 additions & 1 deletion controllers/eventtrigger_deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,11 @@ func getClusterProfilePolicyRefs(localPolicyRef, remotePolicyRef []configv1beta1

// getResources returns a slice of unstructured.Unstructured by processing eventReport.Spec.Resources field
func getResources(eventReport *libsveltosv1beta1.EventReport, logger logr.Logger) ([]unstructured.Unstructured, error) {
elements := strings.Split(string(eventReport.Spec.Resources), "---")
elements, err := deployer.CustomSplit(string(eventReport.Spec.Resources))
if err != nil {
return nil, err
}

result := make([]unstructured.Unstructured, 0)
for i := range elements {
if elements[i] == "" {
Expand Down
45 changes: 44 additions & 1 deletion controllers/eventtrigger_deployer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import (

const (
ClusterKind = "Cluster"
separator = "---"
separator = "---\n"
nginxDeploymentName = "nginx-deployment"
)

Expand Down Expand Up @@ -371,6 +371,49 @@ var _ = Describe("EventTrigger deployer", func() {
Expect(reflect.DeepEqual(hash, expectedHash)).To(BeTrue())
})

It("getResources ", func() {
//nolint: lll // this is a test
eventReportYAML := `apiVersion: lib.projectsveltos.io/v1beta1
kind: EventReport
metadata:
creationTimestamp: "2025-08-08T08:49:40Z"
generation: 2
labels:
eventreport.projectsveltos.io/cluster-name: mgmt
eventreport.projectsveltos.io/cluster-type: sveltos
projectsveltos.io/eventsource-name: trust-bundle-propagation
name: sveltos--trust-bundle-propagation--mgmt
namespace: mgmt
resourceVersion: "87772893"
uid: edd11b32-e77e-459f-aca8-b50cb2af60bd
spec:
clusterName: mgmt
clusterNamespace: mgmt
clusterType: Sveltos
eventSourceName: trust-bundle-propagation
matchingResources:
- apiVersion: v1
kind: ConfigMap
name: linkerd-identity-trust-roots
namespace: linkerd
resources: {"apiVersion":"v1","data":{"ca-bundle.crt":"-----BEGIN CERTIFICATE-----\nMIIBnTCCAUOgAwIBAgIRAKv+8sZjlWdkuBznqZLLhrswCgYIKoZIzj0EAwIwLjEs\nMCoGA1UEAxMjZ2xvYmFsLTEtcm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcN\nMjUwODA4MDQwNjI0WhcNMjUxMTA2MDQwNjI0WjAuMSwwKgYDVQQDEyNnbG9iYWwt\nMS1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABBnvD5ZnCLLMpiscJaxWYAv/rXAgG65OdoqNRflMWpQdMp42bfivU8wW\nL3PP0bdLDGeXcmhMM5oGJnNovp/6BuGjQjBAMA4GA1UdDwEB/wQEAwICpDAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQheJI5jHjkBh919qsRbGuCCurlDDAKBggq\nhkjOPQQDAgNIADBFAiBxWwqd1d+lvRpqK+Lu4XIWcPd/V32vVSWa80ePpsUkBgIh\nAOgLcyctYKR1ADXP7PqwtIHo8e1OM7LFMztCmBwxO2K4\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnDCCAUKgAwIBAgIQSxpDadc4X1fDCIbr6UtCrDAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtNy1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MzRaFw0yNTExMDYwNDA2MzRaMC4xLDAqBgNVBAMTI2dsb2JhbC03\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAEnPREydR5rBRC4l2g2ALI+5gwB/PzvsRwXKzRsplsZAnE726LbTcuFwLQ\nufR6tXp6g8BpKKYxAcjeJRTF5PIniaNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEurFz2SFCfQVnnJj2K3BcvCcvXqMAoGCCqG\nSM49BAMCA0gAMEUCIQCUGScHrSZkPnTzPpmJ7Qhg/CTdhFf/FRAWCN6Gtg9TDgIg\nLWq4Ete2HUMC6NlmVfLDZlTpku5JYnw37KygYsMBsEw=\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnTCCAUOgAwIBAgIRAOucFPdEgDwZ30KOsuvojw8wCgYIKoZIzj0EAwIwLjEs\nMCoGA1UEAxMjZ2xvYmFsLTktcm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcN\nMjUwODA4MDQwNjM3WhcNMjUxMTA2MDQwNjM3WjAuMSwwKgYDVQQDEyNnbG9iYWwt\nOS1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABKvvAoo92+ry77fbZO6ZAv2xbhH7Jdtc2hNvGoS8lpV01AAjnAy1lQb4\n0UBOayviCgSdG0g0Svr9BhuAa5LCpr2jQjBAMA4GA1UdDwEB/wQEAwICpDAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRPNJvzhykXpCtblYg7fhEHZhiQwjAKBggq\nhkjOPQQDAgNIADBFAiAkVUSYpfqZcXUPHkPouQNvaO69RIYSLidHJr09dqzt8gIh\nAKVFY+vjXgRkVeYtJPgQ+2hRrWcwMEKSuapcsJjbKL1X\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnDCCAUKgAwIBAgIQQ53cbqQS0l8yEQrXaPsJKzAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtNS1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MzFaFw0yNTExMDYwNDA2MzFaMC4xLDAqBgNVBAMTI2dsb2JhbC01\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAESB8gWphhaXwZ/hSuZObQZzTSbI6f3Fq4cnhWcNlTdw37AGh6ga7Y+fwr\nv6SeTiXKtF8RB/2KTrEs9y071+0HJKNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIy38bG6fkSVW+QBNWbJahrTldLxMAoGCCqG\nSM49BAMCA0gAMEUCIEcATvO/wKzmAjuYPCIeXe3Hke/tfOnXolYGzF0kZdDhAiEA\noiwhjrDF//+jyNhpzFJGNBBd3cmynTZRsrBxtz0VGa4=\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBmzCCAUKgAwIBAgIQOFjtW4/Cf0a3ru80Lmlw5jAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtMi1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MjdaFw0yNTExMDYwNDA2MjdaMC4xLDAqBgNVBAMTI2dsb2JhbC0y\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAECVtvVWHsjLGVdfb2A+f5dlX94hn4wk9O54xYg9BGG1+WeRIEEcK8pmSe\n2uHg8fphBlj51k6dpVGNIKu1tjEfSqNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFA7TJda7lkssZIcBD8VwkyxhJ3+3MAoGCCqG\nSM49BAMCA0cAMEQCIG+EaXVHqJdcdny/f1rYX0eQ/FZsvkwrRKt2lVsP6k47AiBw\nXCgtFhdXbynKWyu00B+2+4l9zBZzrowRqrOUjZ9J6w==\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnDCCAUKgAwIBAgIQDSUWfX6H5jxSIO+XjGy6tTAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtMC1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MjVaFw0yNTExMDYwNDA2MjVaMC4xLDAqBgNVBAMTI2dsb2JhbC0w\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAEonbRP99e0kxdG/y11gDSVeIOM/s1jI9hQFNI4xgPOOjomWowIwtnZnfu\nOdh72LPWZBO6cYhTq7MSDctdTbPHIqNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFPCiE/MLK+ImunxzGxZGZxxcIWrMAoGCCqG\nSM49BAMCA0gAMEUCIBcTZAtC7qYfyBp84KYDcTA/Q/dbCYwfyKsr/HCU88AhAiEA\n2eM9EBREHzDZWa/7oDasmOJNQSkQYYXYkZo+psroK+w=\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnTCCAUOgAwIBAgIRAPnvLSXhRse8CTRnqj6c8oMwCgYIKoZIzj0EAwIwLjEs\nMCoGA1UEAxMjZ2xvYmFsLTQtcm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcN\nMjUwODA4MDQwNjI2WhcNMjUxMTA2MDQwNjI2WjAuMSwwKgYDVQQDEyNnbG9iYWwt\nNC1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABCN3RBNK/AC+pCdnJh9wY9++917WM0HJQ9jlr4KYjC0JESxtxbH4szqQ\nMR9OMmy+CXZaCCHymbE1/Qio4i9uvEujQjBAMA4GA1UdDwEB/wQEAwICpDAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSEgDoz4m6DuvRux16qBPtK6LCoSzAKBggq\nhkjOPQQDAgNIADBFAiEA4omF20ltubCigB7Yw1uSRKhv2IP26EXU/HKof8ccSy4C\nIGUGxf6Zg5vB9DhoLkJbcemPIKJtU/3Vw7NWKMvrzZ9K\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnDCCAUKgAwIBAgIQOaZFw8yTgY0jlYdnAU+zpzAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtNi1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MzFaFw0yNTExMDYwNDA2MzFaMC4xLDAqBgNVBAMTI2dsb2JhbC02\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAEkuB0ZDnPnQLrheggX0JjZxx9JYWpzviLzUUpZHmSUoSocl/knxs3bq5e\n6gYPERNtmu1dXq9VcRX4ZJsOi6GGUKNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEv/DYqTMp0LFzR403iL6Dw6H+THMAoGCCqG\nSM49BAMCA0gAMEUCIQCaNcp+UCbsLvjKlR03ENlTNjcYcrh/E9y+Dz+gTF3vWgIg\nStd8ek881sU0hFEISYm8lnfXjW3fgkKLUz9RCMYnJ44=\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnTCCAUOgAwIBAgIRAKoZ+LPHHz8jKkum2SsPZ/MwCgYIKoZIzj0EAwIwLjEs\nMCoGA1UEAxMjZ2xvYmFsLTgtcm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcN\nMjUwODA4MDQwNjM1WhcNMjUxMTA2MDQwNjM1WjAuMSwwKgYDVQQDEyNnbG9iYWwt\nOC1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABEcnLmcblbb9MEVd3wR7g9TXV9FQ+e327G0LLFFZ3GjkGqcq2OSQUduP\nnCA4gsSe0hoEtF9AIJqyyrqOcuciMlqjQjBAMA4GA1UdDwEB/wQEAwICpDAPBgNV\nHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRy4mldjQn3QfABpE+K8eoYJaVb0zAKBggq\nhkjOPQQDAgNIADBFAiBOlNhjGi5upJFYTor7Xrv8/aDVDRB5jXsS/DzX/WpeogIh\nAMPw92gx3P9IO4/5ailibJANmszLowRHf9sdDWfeHNCq\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIBnDCCAUKgAwIBAgIQfhlRKppSdnh/ocZ6pFkAVDAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNnbG9iYWwtMy1yb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0y\nNTA4MDgwNDA2MjhaFw0yNTExMDYwNDA2MjhaMC4xLDAqBgNVBAMTI2dsb2JhbC0z\nLXJvb3QubGlua2VyZC5jbHVzdGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0D\nAQcDQgAEwbgXGCORvKD6XZNzxr2SCQ0hu8k1YP6J56BDDzEf3ki9vnkMGlqWCKhH\n0BAHd0v2pjeIPEC/TTDubzRP3Z4+uaNCMEAwDgYDVR0PAQH/BAQDAgKkMA8GA1Ud\nEwEB/wQFMAMBAf8wHQYDVR0OBBYEFO19vgFluegKUCgDLN/7we6TGHz3MAoGCCqG\nSM49BAMCA0gAMEUCIQCej8514oANkoit6lg3XNdmhMH6kyNnXAQwunBMpu8M1QIg\nDGzFe0I4iJbVGK3tPl79KdGJS7mVF2qRXPN5R499KMY=\n-----END CERTIFICATE-----"},"kind":"ConfigMap","metadata":{"annotations":{"trust.cert-manager.io/hash":"0c067911df0b7e62e27466d9815f03eea5e87d1732a775f0994b6a046c3dd0ed"},"creationTimestamp":"2025-08-07T06:44:53Z","labels":{"trust.cert-manager.io/bundle":"linkerd-identity-trust-roots"},"managedFields":[{"apiVersion":"v1","fieldsType":"FieldsV1","fieldsV1":{"f:data":{"f:ca-bundle.crt":{}},"f:metadata":{"f:annotations":{"f:trust.cert-manager.io/hash":{}},"f:labels":{"f:trust.cert-manager.io/bundle":{}},"f:ownerReferences":{"k:{\"uid\":\"ad7cf815-c6a7-4431-934d-a003a0699801\"}":{}}}},"manager":"trust-manager","operation":"Apply","time":"2025-08-08T04:06:40Z"}],"name":"linkerd-identity-trust-roots","namespace":"linkerd","ownerReferences":[{"apiVersion":"trust.cert-manager.io/v1alpha1","blockOwnerDeletion":true,"controller":true,"kind":"Bundle","name":"linkerd-identity-trust-roots","uid":"ad7cf815-c6a7-4431-934d-a003a0699801"}],"resourceVersion":"87300102","uid":"55575fea-308c-4f38-8425-c631f5be6c03"}}
---
status:
phase: WaitingForDelivery`

u, err := deployer.GetUnstructured([]byte(eventReportYAML), logger)
Expect(err).To(BeNil())
Expect(len(u)).To(Equal(1))

eventReport := &libsveltosv1beta1.EventReport{}
err = runtime.DefaultUnstructuredConverter.
FromUnstructured(u[0].UnstructuredContent(), eventReport)
Expect(err).To(BeNil())

resources, err := controllers.GetResources(eventReport, logger)
Expect(err).To(BeNil())
Expect(len(resources)).To(Equal(1))
})

It("removeStaleEventReports removes all EventReports for a given cluster/eventSource pair", func() {
eventSourceName := randomString()
clusterNamespace := randomString()
Expand Down
1 change: 1 addition & 0 deletions controllers/export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ var (
GetConsumersForEntry = getConsumersForEntry

GetCloudEvents = getCloudEvents
GetResources = getResources
)

type (
Expand Down
4 changes: 2 additions & 2 deletions manifest/deployment-shard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ spec:
- --shard-key={{.SHARD}}
- --capi-onboard-annotation=
- --v=5
- --version=v1.0.0
- --version=main
- --agent-in-mgmt-cluster=false
command:
- /manager
image: docker.io/projectsveltos/event-manager:v1.0.0
image: docker.io/projectsveltos/event-manager:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
10 changes: 8 additions & 2 deletions manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ spec:
- paths
type: object
type: array
x-kubernetes-list-type: atomic
eventSourceName:
description: |-
EventSourceName is the name of the referenced EventSource.
Expand Down Expand Up @@ -698,6 +699,7 @@ spec:
rule: 'self.repositoryURL.startsWith(''oci'') ? size(self.repositoryName)
>= 1 : true'
type: array
x-kubernetes-list-type: atomic
kustomizationRefs:
description: |-
Kustomization refs
Expand Down Expand Up @@ -841,6 +843,7 @@ spec:
- namespace
type: object
type: array
x-kubernetes-list-type: atomic
maxUpdate:
anyOf:
- type: integer
Expand Down Expand Up @@ -931,6 +934,7 @@ spec:
- patch
type: object
type: array
x-kubernetes-list-type: atomic
policyRefs:
description: |-
PolicyRefs references all the ConfigMaps/Secrets containing kubernetes resources
Expand Down Expand Up @@ -992,6 +996,7 @@ spec:
- name
type: object
type: array
x-kubernetes-list-type: atomic
reloader:
default: false
description: |-
Expand Down Expand Up @@ -1304,6 +1309,7 @@ spec:
- version
type: object
type: array
x-kubernetes-list-type: atomic
required:
- eventSourceName
- sourceClusterSelector
Expand Down Expand Up @@ -1717,11 +1723,11 @@ spec:
- --shard-key=
- --capi-onboard-annotation=
- --v=5
- --version=v1.0.0
- --version=main
- --agent-in-mgmt-cluster=false
command:
- /manager
image: docker.io/projectsveltos/event-manager:v1.0.0
image: docker.io/projectsveltos/event-manager:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
Loading