From 35a5412dee90e6c40034ee5dca7beb02f316577c Mon Sep 17 00:00:00 2001 From: actions Date: Thu, 3 Aug 2023 08:16:18 +0000 Subject: [PATCH] update rke2-whereabouts to v0.6.2 Signed-off-by: Michael Fritch --- .../rke2-multus-v4.0.2-build2023070702.tgz | Bin 0 -> 6518 bytes .../v4.0.2-build2023070702/.helmignore | 22 +++ .../v4.0.2-build2023070702/Chart.yaml | 17 +++ .../charts/rke2-whereabouts/.helmignore | 23 +++ .../charts/rke2-whereabouts/Chart.yaml | 10 ++ .../crds/whereabouts.cni.cncf.io_ippools.yaml | 69 +++++++++ ...ncf.io_overlappingrangeipreservations.yaml | 56 ++++++++ .../rke2-whereabouts/templates/NOTES.txt | 5 + .../rke2-whereabouts/templates/_helpers.tpl | 86 ++++++++++++ .../templates/cluster_role.yaml | 46 ++++++ .../templates/cluster_role_binding.yaml | 15 ++ .../rke2-whereabouts/templates/daemonset.yaml | 75 ++++++++++ .../templates/serviceaccount.yaml | 13 ++ .../charts/rke2-whereabouts/values.yaml | 50 +++++++ .../templates/NOTES.txt | 34 +++++ .../templates/_helpers.tpl | 27 ++++ .../templates/clusterRole.yaml | 41 ++++++ .../templates/clusterRoleBinding.yaml | 29 ++++ .../templates/configMap.yaml | 27 ++++ .../templates/customResourceDefinition.yaml | 43 ++++++ .../templates/daemonSet.yaml | 103 ++++++++++++++ .../templates/serviceAccount.yaml | 22 +++ .../v4.0.2-build2023070702/values.yaml | 131 ++++++++++++++++++ index.yaml | 21 +++ 24 files changed, 965 insertions(+) create mode 100755 assets/rke2-multus/rke2-multus-v4.0.2-build2023070702.tgz create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/.helmignore create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/Chart.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/.helmignore create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/Chart.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_ippools.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/NOTES.txt create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/_helpers.tpl create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/cluster_role.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/cluster_role_binding.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/daemonset.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/serviceaccount.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/values.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/NOTES.txt create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/_helpers.tpl create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRole.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRoleBinding.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/configMap.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/customResourceDefinition.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/daemonSet.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/serviceAccount.yaml create mode 100755 charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/values.yaml diff --git a/assets/rke2-multus/rke2-multus-v4.0.2-build2023070702.tgz b/assets/rke2-multus/rke2-multus-v4.0.2-build2023070702.tgz new file mode 100755 index 0000000000000000000000000000000000000000..38b964c57fcd4136889d4bfa078acb22fa0bb387 GIT binary patch literal 6518 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 citiQvec6|N`Tdsv3jhHB|KHeCHUO{y0G + SLEEP=false /install-cni.sh && + /ip-control-loop -log-level debug + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: WHEREABOUTS_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: cnibin + mountPath: /host/opt/cni/bin + - name: cni-net-dir + mountPath: /host/etc/cni/net.d + volumes: + - name: cnibin + hostPath: + path: /opt/cni/bin + - name: cni-net-dir + hostPath: + path: /etc/cni/net.d + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/serviceaccount.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/serviceaccount.yaml new file mode 100755 index 000000000..47147d458 --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "whereabouts.serviceAccountName" . }} + {{- include "whereabouts.namespace" . | nindent 2 }} + labels: + {{- include "whereabouts.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/values.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/values.yaml new file mode 100755 index 000000000..3e787cd09 --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/charts/rke2-whereabouts/values.yaml @@ -0,0 +1,50 @@ +# Default values for whereabouts. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +image: + repository: rancher/hardened-whereabouts + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: v0.6.2-build20230717 + +updateStrategy: RollingUpdate +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" +namespaceOverride: "kube-system" +successfulJobsHistoryLimit: 0 + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + #name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: + privileged: true + +resources: + requests: + cpu: "100m" + memory: "100Mi" + limits: + cpu: "100m" + memory: "100Mi" + +nodeSelector: + kubernetes.io/arch: amd64 + +tolerations: + - operator: Exists + effect: NoSchedule + +affinity: {} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/NOTES.txt b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/NOTES.txt new file mode 100755 index 000000000..db7ecc51b --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/NOTES.txt @@ -0,0 +1,34 @@ +====== +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +1. The following components have been deployed as part of this helm chart: +{{- if .Values.manifests.clusterRole }} +Cluster Role: {{ .Values.serviceAccount.name }} +{{- end}} +{{- if .Values.manifests.clusterRoleBinding }} +Cluster Role Binding: {{ .Chart.Name }} +{{- end }} +{{- if .Values.manifests.configMap }} +Config Map: {{ .Release.Name }}-{{ .Chart.Name }}-{{ .Chart.Version }}-config +{{- end }} +{{- if .Values.manifests.customResourceDefinition }} +Custom Resource Definition: network-attachment-definitions.k8s.cni.cncf.io +{{- end }} +{{- if .Values.manifests.daemonSet }} +Daemon Set: {{ .Release.Name }}-{{ .Chart.Name }}-ds +{{- end }} +{{- if .Values.manifests.serviceAccount }} +Service Account: {{ .Values.serviceAccount.name }} +{{- end }} + +You can now deploy any other CNI and create its Network Attachment Defintion. +--------- + +2. To uninstall helm chart use the command: +helm delete {{ .Release.Name }} + +You may have to manually delete CRD - +kubectl delete crd network-attachment-definitions.k8s.cni.cncf.io +--------- +{{- else }} +To run these charts, please use K8s ver >= v1.16 +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/_helpers.tpl b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/_helpers.tpl new file mode 100755 index 000000000..07147a25b --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/_helpers.tpl @@ -0,0 +1,27 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +{{/* Generate basic labels */}} +{{- define "multus.labels" }} +tier: node +app: {{ .Chart.Name }} +{{- end }} + +{{- define "system_default_registry" -}} +{{- if .Values.global.systemDefaultRegistry -}} +{{- printf "%s/" .Values.global.systemDefaultRegistry -}} +{{- else -}} +{{- "" -}} +{{- end -}} +{{- end -}} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRole.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRole.yaml new file mode 100755 index 000000000..14d5c047b --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRole.yaml @@ -0,0 +1,41 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.clusterRole }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: {{ .Chart.Name }} +rules: + - apiGroups: ["k8s.cni.cncf.io"] + resources: + - '*' + verbs: + - '*' + - apiGroups: + - "" + resources: + - pods + - pods/status + verbs: + - get + - update + - apiGroups: + - "" + resources: + - events + verbs: + - create +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRoleBinding.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRoleBinding.yaml new file mode 100755 index 000000000..d413af1ed --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/clusterRoleBinding.yaml @@ -0,0 +1,29 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.clusterRoleBinding }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Chart.Name }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ .Chart.Name }} +subjects: +- kind: ServiceAccount + name: {{ .Values.serviceAccount.name }} + namespace: {{ .Release.Namespace }} +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/configMap.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/configMap.yaml new file mode 100755 index 000000000..04187fd1f --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/configMap.yaml @@ -0,0 +1,27 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.configMap }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-{{ .Chart.Version }}-config + namespace: {{ .Release.Namespace }} + labels: +{{- include "multus.labels" . | indent 4 }} +data: + cni-conf.json: |- +{{ toJson .Values.config.cni_conf | indent 4 }} +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/customResourceDefinition.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/customResourceDefinition.yaml new file mode 100755 index 000000000..d86bf91c3 --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/customResourceDefinition.yaml @@ -0,0 +1,43 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.customResourceDefinition }} +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: network-attachment-definitions.k8s.cni.cncf.io +spec: + group: k8s.cni.cncf.io + scope: Namespaced + names: + plural: network-attachment-definitions + singular: network-attachment-definition + kind: NetworkAttachmentDefinition + shortNames: + - net-attach-def + versions: + - name: v1 + served: true + storage: true + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + properties: + config: + type: string +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/daemonSet.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/daemonSet.yaml new file mode 100755 index 000000000..30eb3f8ed --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/daemonSet.yaml @@ -0,0 +1,103 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.daemonSet }} +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: {{ .Release.Name }}-ds + namespace: {{ .Release.Namespace }} + labels: +{{- include "multus.labels" . | indent 4 }} +spec: + selector: + matchLabels: + app: {{ .Chart.Name }} + updateStrategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + template: + metadata: + labels: +{{- include "multus.labels" . | indent 8 }} + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }} + spec: + priorityClassName: system-node-critical + hostNetwork: true + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + nodeSelector: {{- toYaml .Values.labels.nodeSelector | nindent 8 }} + tolerations: + - operator: Exists + effect: NoSchedule + - operator: Exists + effect: NoExecute + serviceAccountName: {{ .Values.serviceAccount.name }} + initContainers: + - name: cni-plugins + image: {{ template "system_default_registry" . }}{{ .Values.cniplugins.image.repository }}:{{ .Values.cniplugins.image.tag }} + securityContext: + privileged: true + volumeMounts: + - name: cnibin + mountPath: /host/opt/cni/bin + env: + - name: SKIP_CNI_BINARIES + value: {{ .Values.cniplugins.skipcnis }} + containers: + - name: kube-{{ .Chart.Name }} + image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: KUBERNETES_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + command: ["/thin_entrypoint"] + args: + - "--multus-conf-file=auto" + - "--cni-version=0.3.1" + {{- if .Values.pod.resources.multus }} + resources: {{- toYaml .Values.pod.resources.multus | nindent 10 }} + {{- end }} + securityContext: + privileged: true + volumeMounts: + - name: cni + mountPath: /host/etc/cni/net.d + - name: cnibin + mountPath: /host/opt/cni/bin + {{- if .Values.manifests.configMap }} + - name: multus-cfg + mountPath: /tmp/multus-conf/00-multus.conf.template + subPath: "cni-conf.json" + {{- end }} + volumes: + - name: cni + hostPath: + path: /etc/cni/net.d + - name: cnibin + hostPath: + path: /opt/cni/bin + {{- if .Values.manifests.configMap }} + - name: multus-cfg + configMap: + name: {{ .Release.Name }}-{{ .Chart.Name }}-{{ .Chart.Version }}-config + {{- end }} +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/serviceAccount.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/serviceAccount.yaml new file mode 100755 index 000000000..35bcfbf45 --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/templates/serviceAccount.yaml @@ -0,0 +1,22 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +{{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "16" ) }} +{{- if .Values.manifests.serviceAccount }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.serviceAccount.name }} + namespace: {{ .Release.Namespace }} +{{- end }} +{{- end }} diff --git a/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/values.yaml b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/values.yaml new file mode 100755 index 000000000..273e5f3c0 --- /dev/null +++ b/charts/rke2-multus/rke2-multus/v4.0.2-build2023070702/values.yaml @@ -0,0 +1,131 @@ +# Copyright 2020 K8s Network Plumbing Group +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Default values for multus. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +#replicaCount: 1 + +image: + repository: rancher/hardened-multus-cni + tag: v4.0.2-build20230707 + pullPolicy: IfNotPresent + +#imagePullSecrets: [] +#nameOverride: "" +#fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + #create: true + # Annotations to add to the service account + #annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: multus + +pod: + resources: + enabled: false + multus: + requests: + memory: "128Mi" + cpu: "250m" + limits: + memory: "1024Mi" + cpu: "2000m" + +#podSecurityContext: {} + # fsGroup: 2000 + +#securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +#service: + #type: ClusterIP + #port: 80 + +#ingress: + #enabled: false + #annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + #hosts: + #- host: chart-example.local + # paths: [] + #tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +labels: + nodeSelector: + kubernetes.io/os: linux + kubernetes.io/arch: amd64 + +config: + cni_conf: + name: multus-cni-network + type: multus + kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig + cniVersion: 0.3.1 + confDir: /etc/cni/net.d + cniDir: /var/lib/cni/multus + binDir: /opt/cni/bin + logFile: /var/log/multus.log + logLevel: panic + capabilities: + portMappings: true + readinessindicatorfile: "" + namespaceIsolation: false + clusterNetwork: k8s-pod-network + defaultNetwork: [] + delegates: [] + systemNamespaces: ["kube-system"] + +manifests: + serviceAccount: true + clusterRole: true + clusterRoleBinding: true + configMap: false + daemonSet: true + customResourceDefinition: true + +#tolerations: [] + +#affinity: {} + + +## RANCHER ADDDED INFO ## +cniplugins: + image: + repository: rancher/hardened-cni-plugins + tag: v1.2.0-build20230523 + + # skipcnis is a comma separated list of cni binaries to skip from + # installing. + skipcnis: flannel + +global: + systemDefaultRegistry: "" + +rke2-whereabouts: + enabled: false + \ No newline at end of file diff --git a/index.yaml b/index.yaml index d126adfff..927964a81 100755 --- a/index.yaml +++ b/index.yaml @@ -8725,6 +8725,27 @@ entries: - assets/rke2-metrics-server/rke2-metrics-server-2.11.100-build2021022300.tgz version: 2.11.100-build2021022300 rke2-multus: + - apiVersion: v2 + appVersion: 4.0.2 + created: "2023-08-03T08:16:18.707276295Z" + dependencies: + - condition: rke2-whereabouts.enabled + name: rke2-whereabouts + repository: file://./charts/rke2-whereabouts + description: Multus Helm chart for Kubernetes + digest: 0644b98a83d142941d2f92d4685e83f16c139adc116b1d7b37f66b3ddf13d30f + home: https://github.com/k8snetworkplumbingwg/multus-cni + icon: https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/master/doc/images/Multus.png + maintainers: + - email: charts@rancher.com + name: Rancher Labs + name: rke2-multus + sources: + - https://github.com/intel/multus-cni + type: application + urls: + - assets/rke2-multus/rke2-multus-v4.0.2-build2023070702.tgz + version: v4.0.2-build2023070702 - apiVersion: v2 appVersion: 4.0.2 created: "2023-07-07T11:19:51.871251966Z"