From bbbe42a702d114c05ba6fece4914e04a1e7fbde7 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 11 Mar 2024 09:06:34 +0100 Subject: [PATCH] Multus tarballs Signed-off-by: Manuel Buil --- ...ultus-4.0.201+upv4.0.2-build2024020802.tgz | Bin 0 -> 4511 bytes .../.helmignore | 22 +++ .../Chart.yaml | 13 ++ .../templates/NOTES.txt | 33 +++++ .../templates/_helpers.tpl | 27 ++++ .../templates/clusterRole.yaml | 39 +++++ .../templates/clusterRoleBinding.yaml | 27 ++++ .../templates/configMap.yaml | 25 ++++ .../templates/customResourceDefinition.yaml | 41 ++++++ .../templates/daemonSet.yaml | 136 +++++++++++++++++ .../templates/dhcp-daemonSet.yaml | 61 ++++++++ .../templates/serviceAccount.yaml | 20 +++ .../values.yaml | 134 +++++++++++++++++ .../values.yaml.orig | 137 ++++++++++++++++++ 14 files changed, 715 insertions(+) create mode 100644 assets/multus/multus-4.0.201+upv4.0.2-build2024020802.tgz create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/.helmignore create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/Chart.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/NOTES.txt create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/_helpers.tpl create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRole.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRoleBinding.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/configMap.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/customResourceDefinition.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/daemonSet.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/dhcp-daemonSet.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/templates/serviceAccount.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml create mode 100644 charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml.orig diff --git a/assets/multus/multus-4.0.201+upv4.0.2-build2024020802.tgz b/assets/multus/multus-4.0.201+upv4.0.2-build2024020802.tgz new file mode 100644 index 0000000000000000000000000000000000000000..77526d5f62a9df51d6e9e156fa51b69408dffa32 GIT binary patch literal 4511 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 literal 0 HcmV?d00001 diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/.helmignore b/charts/multus/4.0.201+upv4.0.2-build2024020802/.helmignore new file mode 100644 index 0000000..50af031 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/Chart.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/Chart.yaml new file mode 100644 index 0000000..b2b0cac --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/Chart.yaml @@ -0,0 +1,13 @@ +apiVersion: v2 +appVersion: 4.0.2 +description: Multus Helm chart for Kubernetes +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: multus +sources: +- https://github.com/intel/multus-cni +type: application +version: 4.0.201+upv4.0.2-build2024020802 diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/NOTES.txt b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/NOTES.txt new file mode 100644 index 0000000..f0e760f --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/NOTES.txt @@ -0,0 +1,33 @@ +====== +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.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 }} +{{- end }} +{{- if .Values.manifests.dhcpDaemonSet }} +Daemon Set: {{ .Release.Name }}-dhcp +{{- 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 +--------- diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/_helpers.tpl b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/_helpers.tpl new file mode 100644 index 0000000..07147a2 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/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/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRole.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRole.yaml new file mode 100644 index 0000000..d73ef8c --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRole.yaml @@ -0,0 +1,39 @@ +# 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 .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 }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRoleBinding.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRoleBinding.yaml new file mode 100644 index 0000000..49edd96 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/clusterRoleBinding.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 .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 }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/configMap.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/configMap.yaml new file mode 100644 index 0000000..8ebb851 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/configMap.yaml @@ -0,0 +1,25 @@ +# 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 .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 }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/customResourceDefinition.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/customResourceDefinition.yaml new file mode 100644 index 0000000..c8ac8ac --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/customResourceDefinition.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 .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 }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/daemonSet.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/daemonSet.yaml new file mode 100644 index 0000000..a873ed5 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/daemonSet.yaml @@ -0,0 +1,136 @@ +# 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 .Values.manifests.daemonSet }} +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: {{ .Release.Name }} + 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={{ .Values.config.cni_conf.multusConfFile }}" + {{- if .Values.config.cni_conf.cniVersion }} + - "--cni-version={{ .Values.config.cni_conf.cniVersion }}" + {{- end }} + {{- if .Values.config.cni_conf.multusAutoconfigDir }} + - "--multus-autoconfig-dir={{ .Values.config.cni_conf.multusAutoconfigDir }}" + {{- end }} + {{- if .Values.config.cni_conf.kubeconfig }} + - "--multus-kubeconfig-file-host={{ .Values.config.cni_conf.kubeconfig }}" + {{- end }} + {{- if .Values.config.cni_conf.masterCniFilename }} + - "--multus-master-cni-file-name={{ .Values.config.cni_conf.masterCniFilename }}" + {{- end }} + {{- if .Values.config.cni_conf.additionalBinDir }} + - "--additional-bin-dir={{ .Values.config.cni_conf.additionalBinDir }}" + {{- end }} + {{- if .Values.config.cni_conf.skipMultusBinaryCopy }} + - "--skip-multus-binary-copy={{ .Values.config.cni_conf.skipMultusBinaryCopy }}" + {{- end }} + {{- if .Values.config.cni_conf.readinessIndicatorFile }} + - "--readiness-indicator-file={{ .Values.config.cni_conf.readinessIndicatorFile }}" + {{- end }} + {{- if .Values.config.cni_conf.namespaceIsolation }} + - "--cni-namespace-isolation={{ .Values.config.cni_conf.namespaceIsolation }}" + {{- end }} + {{- if .Values.config.cni_conf.globalNamespaces }} + - "--global-namespaces={{ .Values.config.cni_conf.globalNamespaces }}" + {{- end }} + {{- if .Values.config.cni_conf.logLevel }} + - "--multus-log-level={{ .Values.config.cni_conf.logLevel }}" + {{- end }} + {{- if .Values.config.cni_conf.logFile }} + - "--multus-log-file={{ .Values.config.cni_conf.logFile }}" + {{- end }} + {{- if .Values.config.cni_conf.cleanupConfigOnExit }} + - "--cleanup-config-on-exit={{ .Values.config.cni_conf.cleanupConfigOnExit }}" + {{- end }} + {{- 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: {{ .Values.config.cni_conf.confDir }} + - name: cnibin + hostPath: + path: {{ .Values.config.cni_conf.binDir }} + {{- if .Values.manifests.configMap }} + - name: multus-cfg + configMap: + name: {{ .Release.Name }}-{{ .Chart.Name }}-{{ .Chart.Version }}-config + {{- end }} +{{- end }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/dhcp-daemonSet.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/dhcp-daemonSet.yaml new file mode 100644 index 0000000..89b5025 --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/dhcp-daemonSet.yaml @@ -0,0 +1,61 @@ +{{- if .Values.manifests.dhcpDaemonSet }} +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: {{ .Release.Name }}-dhcp + 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 }} + spec: + hostNetwork: true + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + nodeSelector: {{- toYaml .Values.labels.nodeSelector | nindent 8 }} + initContainers: + - name: kube-{{ .Chart.Name }}-dhcp-cleanup + image: {{ template "system_default_registry" . }}{{ .Values.dhcpDaemonSet.image.repository }}:{{ .Values.dhcpDaemonSet.image.tag }} + command: ["rm", "-f", "/run/cni/dhcp.sock"] + securityContext: + privileged: true + volumeMounts: + - name: socketpath + mountPath: /host/run/cni + containers: + - name: kube-{{ .Chart.Name }}-dhcp + image: {{ template "system_default_registry" . }}{{ .Values.dhcpDaemonSet.image.repository }}:{{ .Values.dhcpDaemonSet.image.tag }} + command: ["/opt/cni/bin/dhcp", "daemon"] + securityContext: + privileged: true + volumeMounts: + - name: binpath + mountPath: /opt/cni + - name: socketpath + mountPath: /run/cni + - name: netnspath + mountPath: /var/run/netns + mountPropagation: HostToContainer + volumes: + - name: binpath + hostPath: + path: /opt/cni + - name: socketpath + hostPath: + path: /run/cni + - name: netnspath + hostPath: + path: /run/netns +{{- end }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/serviceAccount.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/serviceAccount.yaml new file mode 100644 index 0000000..858226c --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/templates/serviceAccount.yaml @@ -0,0 +1,20 @@ +# 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 .Values.manifests.serviceAccount }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.serviceAccount.name }} + namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml b/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml new file mode 100644 index 0000000..69fc5ec --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml @@ -0,0 +1,134 @@ +# 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-build20240208 + 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 + +# Multus configuration +# For more details, see https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/how-to-use.md#entrypoint-script-parameters +config: + cni_conf: + confDir: /etc/cni/net.d + binDir: /opt/cni/bin + #namespaceIsolation: false + #globalNamespaces: default,foo,bar + #skipMultusBinaryCopy: false + #readinessIndicatorFile: "" + multusConfFile: auto #or specify a file to be copied on each node + #The following options can be used only when multusConfFile=auto + #multusAutoconfigDir: /host/etc/cni/net.d + kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig + #masterCniFilename: + #logFile: /var/log/multus.log + #logLevel: panic + #cniVersion: 1.0.0 + #cleanupConfigOnExit: true + #additionalBinDir: /opt/multus/bin + +manifests: + serviceAccount: true + clusterRole: true + clusterRoleBinding: true + configMap: false + daemonSet: true + customResourceDefinition: true + dhcpDaemonSet: false + +#tolerations: [] + +#affinity: {} + + +## RANCHER ADDDED INFO ## +cniplugins: + image: + repository: rancher/hardened-cni-plugins + tag: v1.4.0-build20240122 + + # skipcnis is a comma separated list of cni binaries to skip from + # installing. + skipcnis: flannel + +dhcpDaemonSet: + image: + repository: rancher/mirrored-library-busybox + tag: "1.36.1" + +global: + systemDefaultRegistry: "" + diff --git a/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml.orig b/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml.orig new file mode 100644 index 0000000..59c8b7e --- /dev/null +++ b/charts/multus/4.0.201+upv4.0.2-build2024020802/values.yaml.orig @@ -0,0 +1,137 @@ +# 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-build20240208 + 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 + +# Multus configuration +# For more details, see https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/how-to-use.md#entrypoint-script-parameters +config: + cni_conf: + confDir: /etc/cni/net.d + binDir: /opt/cni/bin + #namespaceIsolation: false + #globalNamespaces: default,foo,bar + #skipMultusBinaryCopy: false + #readinessIndicatorFile: "" + multusConfFile: auto #or specify a file to be copied on each node + #The following options can be used only when multusConfFile=auto + #multusAutoconfigDir: /host/etc/cni/net.d + kubeconfig: /etc/cni/net.d/multus.d/multus.kubeconfig + #masterCniFilename: + #logFile: /var/log/multus.log + #logLevel: panic + #cniVersion: 1.0.0 + #cleanupConfigOnExit: true + #additionalBinDir: /opt/multus/bin + +manifests: + serviceAccount: true + clusterRole: true + clusterRoleBinding: true + configMap: false + daemonSet: true + customResourceDefinition: true + dhcpDaemonSet: false + +#tolerations: [] + +#affinity: {} + + +## RANCHER ADDDED INFO ## +cniplugins: + image: + repository: rancher/hardened-cni-plugins + tag: v1.4.0-build20240122 + + # skipcnis is a comma separated list of cni binaries to skip from + # installing. + skipcnis: flannel + +dhcpDaemonSet: + image: + repository: rancher/mirrored-library-busybox + tag: "1.36.1" + +global: + systemDefaultRegistry: "" + +rke2-whereabouts: + enabled: false +