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

Bump flannel version to v0.26.0-build20241024 and Calico to v3.29.0-build20241104 on Canal #555

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
4 changes: 2 additions & 2 deletions packages/rke2-canal/charts/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: rke2-canal
description: Install Canal Network Plugin.
version: v3.28.2-build20241016
appVersion: v3.28.2
version: v3.29.0-build20241104
appVersion: v3.29.0
home: https://www.projectcalico.org/
keywords:
- canal
Expand Down

Large diffs are not rendered by default.

62 changes: 62 additions & 0 deletions packages/rke2-canal/charts/templates/crds/tiers.crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: (devel)
creationTimestamp: null
name: tiers.crd.projectcalico.org
spec:
group: crd.projectcalico.org
names:
kind: Tier
listKind: TierList
plural: tiers
singular: tier
scope: Cluster
versions:
- name: v1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: TierSpec contains the specification for a security policy
tier resource.
properties:
defaultAction:
description: 'DefaultAction specifies the action applied to workloads
selected by a policy in the tier, but not rule matched the workload''s
traffic. [Default: Deny]'
enum:
- Pass
- Deny
type: string
order:
description: Order is an optional field that specifies the order in
which the tier is applied. Tiers with higher "order" are applied
after those with lower order. If the order is omitted, it may be
considered to be "infinite" - i.e. the tier will be applied last. Tiers
with identical order will be applied in alphanumerical order based
on the Tier "Name".
type: number
type: object
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 9 additions & 0 deletions packages/rke2-canal/charts/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ rules:
verbs:
- watch
- list
# Watch for changes to Kubernetes AdminNetworkPolicies.
- apiGroups: ["policy.networking.k8s.io"]
resources:
- adminnetworkpolicies
verbs:
- watch
- list
# Used by Calico for policy information.
- apiGroups: [""]
resources:
Expand Down Expand Up @@ -96,6 +103,7 @@ rules:
- clusterinformations
- hostendpoints
- blockaffinities
- tiers
verbs:
- get
- list
Expand Down Expand Up @@ -226,6 +234,7 @@ rules:
- blockaffinities
- ipamblocks
- ipamhandles
- tiers
verbs:
- get
- list
Expand Down
8 changes: 4 additions & 4 deletions packages/rke2-canal/charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ calico:
# CNI installation image.
cniImage:
repository: rancher/hardened-calico
tag: v3.28.2-build20241016
tag: v3.29.0-build20241104
# Canal node image.
nodeImage:
repository: rancher/hardened-calico
tag: v3.28.2-build20241016
tag: v3.29.0-build20241104
# Flexvol Image.
flexvolImage:
repository: rancher/hardened-calico
tag: v3.28.2-build20241016
tag: v3.29.0-build20241104
# kubecontroller image
kubeControllerImage:
repository: rancher/hardened-calico
tag: v3.28.2-build20241016
tag: v3.29.0-build20241104
# Datastore type for canal. It can be either kuberentes or etcd.
datastoreType: kubernetes
# Wait for datastore to initialize.
Expand Down
2 changes: 1 addition & 1 deletion packages/rke2-canal/package.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
url: local
packageVersion: 02
packageVersion: 00
Loading