From d597b640cc4ca9287e761e1711bcbbcccbddcab4 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 15 Apr 2024 14:04:02 +0200 Subject: [PATCH] Remove multus from the helm repo Signed-off-by: Manuel Buil --- .../rke2-whereabouts/dependency.yaml | 3 - .../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 | 83 ----------------- .../templates/cluster_role.yaml | 52 ----------- .../templates/cluster_role_binding.yaml | 15 --- .../rke2-whereabouts/templates/configmap.yaml | 10 -- .../rke2-whereabouts/templates/daemonset.yaml | 92 ------------------- .../templates/serviceaccount.yaml | 13 --- .../charts/rke2-whereabouts/values.yaml | 50 ---------- .../generated-changes/patch/Chart.yaml.patch | 22 ----- .../generated-changes/patch/values.yaml.patch | 9 -- packages/multus/package.yaml | 2 - 15 files changed, 491 deletions(-) delete mode 100644 packages/multus/generated-changes/dependencies/rke2-whereabouts/dependency.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/Chart.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_ippools.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/NOTES.txt delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/_helpers.tpl delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role_binding.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/configmap.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/daemonset.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/serviceaccount.yaml delete mode 100644 packages/multus/generated-changes/exclude/charts/rke2-whereabouts/values.yaml delete mode 100644 packages/multus/generated-changes/patch/Chart.yaml.patch delete mode 100644 packages/multus/generated-changes/patch/values.yaml.patch delete mode 100644 packages/multus/package.yaml diff --git a/packages/multus/generated-changes/dependencies/rke2-whereabouts/dependency.yaml b/packages/multus/generated-changes/dependencies/rke2-whereabouts/dependency.yaml deleted file mode 100644 index 1a10ce9..0000000 --- a/packages/multus/generated-changes/dependencies/rke2-whereabouts/dependency.yaml +++ /dev/null @@ -1,3 +0,0 @@ -workingDir: "" -url: https://github.com/rancher/rke2-charts/raw/main/assets/rke2-multus/rke2-multus-v4.0.2-build2023081108.tgz -subdirectory: charts/rke2-whereabouts diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/Chart.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/Chart.yaml deleted file mode 100644 index 2596983..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -appVersion: 0.6.3 -description: A Helm chart to deploy the whereabouts CNI -home: https://github.com/k8snetworkplumbingwg/whereabouts -maintainers: -- email: charts@rancher.com - name: Rancher Labs -name: rke2-whereabouts -type: application -version: 0.1.1 diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_ippools.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_ippools.yaml deleted file mode 100644 index c912654..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_ippools.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.1 - creationTimestamp: null - name: ippools.whereabouts.cni.cncf.io -spec: - group: whereabouts.cni.cncf.io - names: - kind: IPPool - listKind: IPPoolList - plural: ippools - singular: ippool - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: IPPool is the Schema for the ippools API - 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: IPPoolSpec defines the desired state of IPPool - properties: - allocations: - additionalProperties: - description: IPAllocation represents metadata about the pod/container - owner of a specific IP - properties: - id: - type: string - podref: - type: string - required: - - id - type: object - description: Allocations is the set of allocated IPs for the given - range. Its` indices are a direct mapping to the IP with the same - index/offset for the pool's range. - type: object - range: - description: Range is a RFC 4632/4291-style string that represents - an IP address and prefix length in CIDR notation - type: string - required: - - allocations - - range - type: object - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml deleted file mode 100644 index 82d9547..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.4.1 - creationTimestamp: null - name: overlappingrangeipreservations.whereabouts.cni.cncf.io -spec: - group: whereabouts.cni.cncf.io - names: - kind: OverlappingRangeIPReservation - listKind: OverlappingRangeIPReservationList - plural: overlappingrangeipreservations - singular: overlappingrangeipreservation - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: OverlappingRangeIPReservation is the Schema for the OverlappingRangeIPReservations - API - 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: OverlappingRangeIPReservationSpec defines the desired state - of OverlappingRangeIPReservation - properties: - containerid: - type: string - podref: - type: string - required: - - containerid - type: object - required: - - spec - type: object - served: true - storage: true -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/NOTES.txt b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/NOTES.txt deleted file mode 100644 index e68e92d..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/NOTES.txt +++ /dev/null @@ -1,5 +0,0 @@ -Whereabouts is installed!! - -You can view the pods with the following command: - -kubectl get pods -n {{ .Release.Namespace }} -l app=whereabouts diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/_helpers.tpl b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/_helpers.tpl deleted file mode 100644 index bff8067..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/_helpers.tpl +++ /dev/null @@ -1,83 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "whereabouts.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "whereabouts.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Provide a method to override namespace so parent charts can set it -*/}} -{{- define "whereabouts.namespace" -}} -{{- if hasKey .Values "namespaceOverride" -}} -namespace: {{ .Values.namespaceOverride }} -{{- else }} -namespace: {{ .Release.Namespace }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "whereabouts.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "whereabouts.labels" -}} -app: whereabouts -helm.sh/chart: {{ include "whereabouts.chart" . }} -{{ include "whereabouts.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "whereabouts.selectorLabels" -}} -app: {{ include "whereabouts.name" . }} -app.kubernetes.io/name: {{ include "whereabouts.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "whereabouts.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "whereabouts.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{- define "system_default_registry" -}} -{{- if .Values.global.systemDefaultRegistry -}} -{{- printf "%s/" .Values.global.systemDefaultRegistry -}} -{{- else -}} -{{- "" -}} -{{- end -}} -{{- end -}} diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role.yaml deleted file mode 100644 index 2a6776c..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ include "whereabouts.serviceAccountName" . }} -rules: -- apiGroups: - - whereabouts.cni.cncf.io - resources: - - ippools - - overlappingrangeipreservations - verbs: - - get - - list - - watch - - create - - update - - patch - - delete -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - '*' -- apiGroups: [""] - resources: - - pods - verbs: - - list - - watch -- apiGroups: [""] - resources: - - nodes - verbs: - - get -- apiGroups: ["k8s.cni.cncf.io"] - resources: - - network-attachment-definitions - verbs: - - get - - list - - watch -- apiGroups: - - "" - - events.k8s.io - resources: - - events - verbs: - - create - - patch - - update - - get diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role_binding.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role_binding.yaml deleted file mode 100644 index b1c0127..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/cluster_role_binding.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.serviceAccount.create -}} ---- -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ include "whereabouts.serviceAccountName" . }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ include "whereabouts.serviceAccountName" . }} -subjects: -- kind: ServiceAccount - name: {{ include "whereabouts.serviceAccountName" . }} - {{- include "whereabouts.namespace" . | nindent 2 }} -{{- end }} diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/configmap.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/configmap.yaml deleted file mode 100644 index a931f35..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "whereabouts.fullname" . }}-config - {{- include "whereabouts.namespace" . | nindent 2 }} - annotations: - kubernetes.io/description: | - Configmap containing user customizable cronjob schedule -data: - cron-expression: "30 4 * * *" # Default schedule is once per day at 4:30am. Users may configure this value to their liking. diff --git a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/daemonset.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/daemonset.yaml deleted file mode 100644 index db16940..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/daemonset.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: {{ include "whereabouts.fullname" . }} - {{- include "whereabouts.namespace" . | nindent 2 }} - labels: - {{- include "whereabouts.labels" . | nindent 4 }} -spec: - selector: - matchLabels: - name: whereabouts - {{- include "whereabouts.selectorLabels" . | nindent 6 }} - updateStrategy: - type: {{ .Values.updateStrategy }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - name: whereabouts - {{- include "whereabouts.selectorLabels" . | nindent 8 }} - spec: - hostNetwork: true - serviceAccountName: {{ include "whereabouts.serviceAccountName" . }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: #TODO still needed? - {{- toYaml .Values.podSecurityContext | nindent 8 }} - tolerations: - - operator: Exists - effect: NoSchedule - containers: - - name: {{ .Chart.Name }} - command: [ "/bin/sh" ] - args: - - -c - - > - 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: NODENAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - - 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 - - name: cron-scheduler-configmap - mountPath: /cron-schedule - volumes: - - name: cnibin - hostPath: - path: /opt/cni/bin - - name: cni-net-dir - hostPath: - path: /etc/cni/net.d - - name: cron-scheduler-configmap - configMap: - name: {{ include "whereabouts.fullname" . }}-config - defaultMode: 0744 - items: - - key: "cron-expression" - path: "config" - {{- 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/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/serviceaccount.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/serviceaccount.yaml deleted file mode 100644 index 47147d4..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- 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/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/values.yaml b/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/values.yaml deleted file mode 100644 index ccd2e37..0000000 --- a/packages/multus/generated-changes/exclude/charts/rke2-whereabouts/values.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# 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.3-build20240109 - -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" - -nodeSelector: - kubernetes.io/arch: amd64 - -tolerations: - - operator: Exists - effect: NoSchedule - -affinity: {} - -global: - systemDefaultRegistry: "" diff --git a/packages/multus/generated-changes/patch/Chart.yaml.patch b/packages/multus/generated-changes/patch/Chart.yaml.patch deleted file mode 100644 index e441f41..0000000 --- a/packages/multus/generated-changes/patch/Chart.yaml.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- charts-original/Chart.yaml -+++ charts/Chart.yaml -@@ -1,17 +1,13 @@ - apiVersion: v2 - appVersion: 4.0.2 --dependencies: --- condition: rke2-whereabouts.enabled -- name: rke2-whereabouts -- repository: file://./charts/rke2-whereabouts - 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: rke2-multus -+name: multus - sources: - - https://github.com/intel/multus-cni - type: application --version: v4.0.2-build2024020802 -+version: 4.0.2 diff --git a/packages/multus/generated-changes/patch/values.yaml.patch b/packages/multus/generated-changes/patch/values.yaml.patch deleted file mode 100644 index 3c36d3e..0000000 --- a/packages/multus/generated-changes/patch/values.yaml.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- charts-original/values.yaml -+++ charts/values.yaml -@@ -133,6 +133,3 @@ - global: - systemDefaultRegistry: "" - --rke2-whereabouts: -- enabled: false -- diff --git a/packages/multus/package.yaml b/packages/multus/package.yaml deleted file mode 100644 index 0895d2c..0000000 --- a/packages/multus/package.yaml +++ /dev/null @@ -1,2 +0,0 @@ -url: https://github.com/rancher/rke2-charts/raw/main/assets/rke2-multus/rke2-multus-v4.0.2-build2024020802.tgz -packageVersion: 01