Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

operator changes for managed cluster #2863

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

operator changes for managed cluster #2863

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00ad820
operator changes for log collector, cluster connection
sridhartigera Sep 11, 2023
0128081
Address review comments
sridhartigera Sep 12, 2023
031643e
Add support monitor resource
sridhartigera Sep 14, 2023
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
5 changes: 5 additions & 0 deletions config/calico_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,8 @@ components:
version: master
csi-node-driver-registrar:
version: master
calico/fluentd:
version: master
calico/guardian:
version: master
image: tigera/guardian
16 changes: 16 additions & 0 deletions hack/gen-versions/calico.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,26 @@ var (
Registry: "{{ .Registry }}",
}
{{- end }}
{{ with index .Components "calico/fluentd"}}
ComponentCalicoFluentd = component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
{{ with index .Components "csi-node-driver-registrar"}}
ComponentCalicoCSIRegistrarFIPS = component{
Version: "{{ .Version }}-fips",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
{{ with index .Components "calico/guardian" }}
ComponentCalicoGuardian = component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
ComponentOperatorInit = component{
Version: version.VERSION,
Expand All @@ -155,6 +169,8 @@ var (
ComponentCalicoCSI,
ComponentCalicoCSIFIPS,
ComponentCalicoCSIRegistrar,
ComponentCalicoFluentd,
ComponentCalicoCSIRegistrarFIPS,
ComponentCalicoGuardian,
}
)
2 changes: 2 additions & 0 deletions hack/gen-versions/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ var defaultImages = map[string]string{
"calico/apiserver": "calico/apiserver",
"calico/windows-upgrade": "calico/windows-upgrade",
"tigera/linseed": "tigera/linseed",
"calico/fluentd": "calico/fluentd",
"calico/guardian": "calico/guardian",
}

var ignoredImages = map[string]struct{}{
Expand Down
8 changes: 4 additions & 4 deletions hack/gen-versions/enterprise.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ var (
}
{{- end }}
{{ with .Components.fluentd }}
ComponentFluentd = component{
ComponentTigeraFluentd = component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
}
{{- end }}
{{ with index .Components "fluentd-windows" }}
ComponentFluentdWindows = component{
ComponentTigeraFluentdWindows = component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
Expand Down Expand Up @@ -387,8 +387,8 @@ var (
ComponentElasticsearchOperator,
ComponentEsCurator,
ComponentEsProxy,
ComponentFluentd,
ComponentFluentdWindows,
ComponentTigeraFluentd,
ComponentTigeraFluentdWindows,
ComponentGuardian,
ComponentIntrusionDetectionController,
ComponentAnomalyDetectionJobs,
Expand Down
15 changes: 15 additions & 0 deletions pkg/apis/crd.projectcalico.org/v1/felixconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,21 @@ type FelixConfigurationSpec struct {
// `[fd00:83a6::12]:5353`.Note that Felix (calico-node) will need RBAC permission to read the details of
// each service specified by a `k8s-service:...` form. [Default: "k8s-service:kube-dns"].
DNSTrustedServers *[]string `json:"dnsTrustedServers,omitempty"`

// FlowLogsFileEnabled controls whether flow logs is enabled. [Default: false]
FlowLogsFileEnabled *bool `json:"flowLogsFileEnabled,omitempty"`

// FlowLogsFileIncludeService controls whether service information is enabled in the flow logs. [Default: false]
FlowLogsFileIncludeService *bool `json:"flowLogsFileIncludeService,omitempty"`

// FlowLogsFileIncludePolicies controls whether policy information is enabled in the flow logs. [Default: false]
FlowLogsFileIncludePolicies *bool `json:"flowLogsFileIncludePolicies,omitempty"`

// FlowLogsEnableHostEndpoint enables flow logs reporting for host endpoints. [Default: false]
FlowLogsEnableHostEndpoint *bool `json:"flowLogsEnableHostEndpoint,omitempty"`

// FlowLogsEnableNetworkSets enables flow logs reporting for global network sets. [Default: false]
FlowLogsEnableNetworkSets *bool `json:"flowLogsEnableNetworkSets,omitempty"`
}

type RouteTableRange struct {
Expand Down
25 changes: 25 additions & 0 deletions pkg/apis/crd.projectcalico.org/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/components/calico.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,23 @@ var (
Registry: "",
}

ComponentCalicoFluentd = component{
Version: "master",
Image: "calico/fluentd",
Registry: "",
}

ComponentCalicoCSIRegistrarFIPS = component{
Version: "master-fips",
Image: "calico/node-driver-registrar",
Registry: "",
}

ComponentCalicoGuardian = component{
Version: "master",
Image: "tigera/guardian",
Registry: "",
}
ComponentOperatorInit = component{
Version: version.VERSION,
Image: "tigera/operator",
Expand All @@ -139,6 +151,8 @@ var (
ComponentCalicoCSI,
ComponentCalicoCSIFIPS,
ComponentCalicoCSIRegistrar,
ComponentCalicoFluentd,
ComponentCalicoCSIRegistrarFIPS,
ComponentCalicoGuardian,
}
)
8 changes: 4 additions & 4 deletions pkg/components/enterprise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ var (
Registry: "",
}

ComponentFluentd = component{
ComponentTigeraFluentd = component{
Version: "master",
Image: "tigera/fluentd",
Registry: "",
}

ComponentFluentdWindows = component{
ComponentTigeraFluentdWindows = component{
Version: "master",
Image: "tigera/fluentd-windows",
Registry: "",
Expand Down Expand Up @@ -336,8 +336,8 @@ var (
ComponentElasticsearchOperator,
ComponentEsCurator,
ComponentEsProxy,
ComponentFluentd,
ComponentFluentdWindows,
ComponentTigeraFluentd,
ComponentTigeraFluentdWindows,
ComponentGuardian,
ComponentIntrusionDetectionController,
ComponentAnomalyDetectionJobs,
Expand Down
3 changes: 2 additions & 1 deletion pkg/components/references.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ func GetReference(c component, registry, imagePath, imagePrefix string, is *oper
ComponentCalicoCSI,
ComponentCalicoCSIFIPS,
ComponentCalicoCSIRegistrar,
ComponentCalicoCSIRegistrarFIPS:
ComponentCalicoCSIRegistrarFIPS,
ComponentCalicoFluentd:

registry = CalicoRegistry
case ComponentOperatorInit:
Expand Down
Loading