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.

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

[dev-v2.11] fleet 106.0.0+up0.12.0-alpha.3 update #4996

Merged
merged 3 commits into from
Jan 21, 2025
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed assets/fleet/fleet-106.0.0+up0.12.0-alpha.2.tgz
Binary file not shown.
Binary file added assets/fleet/fleet-106.0.0+up0.12.0-alpha.3.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ annotations:
catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0'
catalog.cattle.io/release-name: fleet-agent
apiVersion: v2
appVersion: 0.12.0-alpha.2
appVersion: 0.12.0-alpha.3
description: Fleet Agent - GitOps at Scale
icon: https://charts.rancher.io/assets/logos/fleet.svg
name: fleet-agent
version: 106.0.0+up0.12.0-alpha.2
version: 106.0.0+up0.12.0-alpha.3
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
os: "windows,linux"
repository: rancher/fleet-agent
tag: v0.12.0-alpha.2
tag: v0.12.0-alpha.3

# The public URL of the Kubernetes API server running the Fleet Controller must be set here
# Example: https://example.com:6443
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ annotations:
catalog.cattle.io/permits-os: linux,windows
catalog.cattle.io/release-name: fleet-crd
apiVersion: v2
appVersion: 0.12.0-alpha.2
appVersion: 0.12.0-alpha.3
description: Fleet CustomResourceDefinitions
icon: https://charts.rancher.io/assets/logos/fleet.svg
name: fleet-crd
version: 106.0.0+up0.12.0-alpha.2
version: 106.0.0+up0.12.0-alpha.3
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,11 @@ spec:
nullable: true
type: string
type: object
incompleteState:
description: IncompleteState is true if there are more than 10 non-ready
or modified resources, meaning that the lists in those fields
have been truncated.
type: boolean
modifiedStatus:
items:
description: 'ModifiedStatus is used to report the status of a
Expand Down Expand Up @@ -998,6 +1003,42 @@ spec:
description: Release is the Helm release ID
nullable: true
type: string
resourceCounts:
description: ResourceCounts contains the number of resources in
each state.
properties:
desiredReady:
description: DesiredReady is the number of resources that should
be ready.
type: integer
missing:
description: Missing is the number of missing resources.
type: integer
modified:
description: Modified is the number of resources that have been
modified.
type: integer
notReady:
description: 'NotReady is the number of not ready resources.
Resources are not

ready if they do not match any other state.'
type: integer
orphaned:
description: Orphaned is the number of orphaned resources.
type: integer
ready:
description: Ready is the number of ready resources.
type: integer
unknown:
description: Unknown is the number of resources in an unknown
state.
type: integer
waitApplied:
description: WaitApplied is the number of resources that are
waiting to be applied.
type: integer
type: object
resources:
description: 'Resources lists the metadata of resources that were
deployed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ annotations:
catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0'
catalog.cattle.io/release-name: fleet
apiVersion: v2
appVersion: 0.12.0-alpha.2
appVersion: 0.12.0-alpha.3
description: Fleet Controller - GitOps at Scale
icon: https://charts.rancher.io/assets/logos/fleet.svg
name: fleet
version: 106.0.0+up0.12.0-alpha.2
version: 106.0.0+up0.12.0-alpha.3
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ spec:
- name: NO_PROXY
value: {{ $.Values.noProxy }}
{{- end }}
{{- if $.Values.gitops.syncPeriod }}
- name: GITREPO_SYNC_PERIOD
value: {{ quote $.Values.gitops.syncPeriod }}
{{- end }}
{{- if $.Values.controller.reconciler.workers.gitrepo }}
- name: GITREPO_RECONCILER_WORKERS
value: {{ quote $.Values.controller.reconciler.workers.gitrepo }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
image:
repository: rancher/fleet
tag: v0.12.0-alpha.2
tag: v0.12.0-alpha.3
imagePullPolicy: IfNotPresent

agentImage:
repository: rancher/fleet-agent
tag: v0.12.0-alpha.2
tag: v0.12.0-alpha.3
imagePullPolicy: IfNotPresent

# For cluster registration the public URL of the Kubernetes API server must be set here
Expand Down Expand Up @@ -77,6 +77,9 @@ priorityClassName: ""

gitops:
enabled: true
# syncPeriod is used to pick up polling for lost gitrepo events.
# It should be larger than the largest gitrepo pollinginterval.
syncPeriod: 2h

metrics:
enabled: true
Expand Down
10 changes: 10 additions & 0 deletions charts/rancher-cis-benchmark-crd/105.2.0+up7.2.0/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
annotations:
catalog.cattle.io/certified: rancher
catalog.cattle.io/hidden: "true"
catalog.cattle.io/namespace: cis-operator-system
catalog.cattle.io/release-name: rancher-cis-benchmark-crd
apiVersion: v1
description: Installs the CRDs for rancher-cis-benchmark.
name: rancher-cis-benchmark-crd
type: application
version: 105.2.0+up7.2.0
2 changes: 2 additions & 0 deletions charts/rancher-cis-benchmark-crd/105.2.0+up7.2.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# rancher-cis-benchmark-crd
A Rancher chart that installs the CRDs used by rancher-cis-benchmark.
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: clusterscans.cis.cattle.io
spec:
group: cis.cattle.io
names:
kind: ClusterScan
plural: clusterscans
singular: clusterscan
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .status.lastRunScanProfileName
name: ClusterScanProfile
type: string
- jsonPath: .status.summary.total
name: Total
type: string
- jsonPath: .status.summary.pass
name: Pass
type: string
- jsonPath: .status.summary.fail
name: Fail
type: string
- jsonPath: .status.summary.skip
name: Skip
type: string
- jsonPath: .status.summary.warn
name: Warn
type: string
- jsonPath: .status.summary.notApplicable
name: Not Applicable
type: string
- jsonPath: .status.lastRunTimestamp
name: LastRunTimestamp
type: string
- jsonPath: .spec.scheduledScanConfig.cronSchedule
name: CronSchedule
type: string
name: v1
schema:
openAPIV3Schema:
properties:
spec:
properties:
scanProfileName:
nullable: true
type: string
scheduledScanConfig:
nullable: true
properties:
cronSchedule:
nullable: true
type: string
retentionCount:
type: integer
scanAlertRule:
nullable: true
properties:
alertOnComplete:
type: boolean
alertOnFailure:
type: boolean
type: object
type: object
scoreWarning:
enum:
- pass
- fail
nullable: true
type: string
type: object
status:
properties:
NextScanAt:
nullable: true
type: string
ScanAlertingRuleName:
nullable: true
type: string
conditions:
items:
properties:
lastTransitionTime:
nullable: true
type: string
lastUpdateTime:
nullable: true
type: string
message:
nullable: true
type: string
reason:
nullable: true
type: string
status:
nullable: true
type: string
type:
nullable: true
type: string
type: object
nullable: true
type: array
display:
nullable: true
properties:
error:
type: boolean
message:
nullable: true
type: string
state:
nullable: true
type: string
transitioning:
type: boolean
type: object
lastRunScanProfileName:
nullable: true
type: string
lastRunTimestamp:
nullable: true
type: string
observedGeneration:
type: integer
summary:
nullable: true
properties:
fail:
type: integer
notApplicable:
type: integer
pass:
type: integer
skip:
type: integer
total:
type: integer
warn:
type: integer
type: object
type: object
type: object
served: true
storage: true
subresources:
status: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: clusterscanbenchmarks.cis.cattle.io
spec:
group: cis.cattle.io
names:
kind: ClusterScanBenchmark
plural: clusterscanbenchmarks
singular: clusterscanbenchmark
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.clusterProvider
name: ClusterProvider
type: string
- jsonPath: .spec.minKubernetesVersion
name: MinKubernetesVersion
type: string
- jsonPath: .spec.maxKubernetesVersion
name: MaxKubernetesVersion
type: string
- jsonPath: .spec.customBenchmarkConfigMapName
name: customBenchmarkConfigMapName
type: string
- jsonPath: .spec.customBenchmarkConfigMapNamespace
name: customBenchmarkConfigMapNamespace
type: string
name: v1
schema:
openAPIV3Schema:
properties:
spec:
properties:
clusterProvider:
nullable: true
type: string
customBenchmarkConfigMapName:
nullable: true
type: string
customBenchmarkConfigMapNamespace:
nullable: true
type: string
maxKubernetesVersion:
nullable: true
type: string
minKubernetesVersion:
nullable: true
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: clusterscanprofiles.cis.cattle.io
spec:
group: cis.cattle.io
names:
kind: ClusterScanProfile
plural: clusterscanprofiles
singular: clusterscanprofile
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.benchmarkVersion
name: BenchmarkVersion
type: string
name: v1
schema:
openAPIV3Schema:
properties:
spec:
properties:
benchmarkVersion:
nullable: true
type: string
skipTests:
items:
nullable: true
type: string
nullable: true
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading
Loading