From bf3383fbd0065082fc4cb733974067b890936ecd Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Sun, 31 Dec 2017 11:52:25 -0500
Subject: [PATCH] NFS: remove chart from OSH
This PS removes the NFS chart from OSH, as the one in OSH-Infra is
both better maintained, and the correct loaction for this chart.
Change-Id: If310664e9b1d6a6e1494a9df63d02fd6f0d605d3
---
nfs-provisioner/Chart.yaml | 24 ------
nfs-provisioner/requirements.yaml | 19 -----
nfs-provisioner/templates/deployment.yaml | 78 --------------------
nfs-provisioner/templates/service.yaml | 39 ----------
nfs-provisioner/templates/storage_class.yaml | 27 -------
nfs-provisioner/values.yaml | 72 ------------------
6 files changed, 259 deletions(-)
delete mode 100644 nfs-provisioner/Chart.yaml
delete mode 100644 nfs-provisioner/requirements.yaml
delete mode 100644 nfs-provisioner/templates/deployment.yaml
delete mode 100644 nfs-provisioner/templates/service.yaml
delete mode 100644 nfs-provisioner/templates/storage_class.yaml
delete mode 100644 nfs-provisioner/values.yaml
diff --git a/nfs-provisioner/Chart.yaml b/nfs-provisioner/Chart.yaml
deleted file mode 100644
index 1ac8815f71..0000000000
--- a/nfs-provisioner/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# 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.
-
-apiVersion: v1
-description: OpenStack-Helm NFS
-name: nfs-provisioner
-version: 0.1.0
-home: https://github.com/kubernetes-incubator/external-storage
-sources:
- - https://github.com/kubernetes-incubator/external-storage
- - https://git.openstack.org/cgit/openstack/openstack-helm
-maintainers:
- - name: OpenStack-Helm Authors
diff --git a/nfs-provisioner/requirements.yaml b/nfs-provisioner/requirements.yaml
deleted file mode 100644
index 00a045b4e4..0000000000
--- a/nfs-provisioner/requirements.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# 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.
-
-dependencies:
- - name: helm-toolkit
- repository: http://localhost:8879/charts
- version: 0.1.0
diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml
deleted file mode 100644
index 7ad149d71a..0000000000
--- a/nfs-provisioner/templates/deployment.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-{{/*
-Copyright 2017 The Openstack-Helm Authors.
-
-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.deployment }}
-{{- $envAll := . }}
----
-kind: Deployment
-apiVersion: apps/v1beta1
-metadata:
- name: nfs-provisioner
-spec:
- replicas: {{ .Values.pod.replicas.server }}
- strategy:
- type: Recreate
- template:
- metadata:
- labels:
-{{ tuple $envAll "nfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
- spec:
- affinity:
-{{ tuple $envAll "nfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
- nodeSelector:
- {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
- containers:
- - name: nfs-provisioner
- image: {{ .Values.images.tags.nfs_provisioner }}
- imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- securityContext:
- capabilities:
- add:
- - DAC_READ_SEARCH
- - SYS_RESOURCE
- ports:
- - name: nfs
- containerPort: 2049
- - name: mountd
- containerPort: 20048
- - name: rpcbind
- containerPort: 111
- - name: rpcbind-udp
- containerPort: 111
- protocol: UDP
- env:
- - name: POD_IP
- valueFrom:
- fieldRef:
- fieldPath: status.podIP
- - name: SERVICE_NAME
- value: {{ tuple "nfs" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- args:
- - "-provisioner={{ .Values.storageclass.provisioner }}"
- - "-grace-period=10"
- volumeMounts:
- - name: export-volume
- mountPath: /export
- volumes:
- - name: export-volume
- hostPath:
- path: {{ .Values.storage.host.host_path }}
-{{- end }}
diff --git a/nfs-provisioner/templates/service.yaml b/nfs-provisioner/templates/service.yaml
deleted file mode 100644
index 7ece1f5cbc..0000000000
--- a/nfs-provisioner/templates/service.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-Copyright 2017 The Openstack-Helm Authors.
-
-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.service }}
-{{- $envAll := . }}
----
-kind: Service
-apiVersion: v1
-metadata:
- name: {{ tuple "nfs" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
- labels:
-{{ tuple $envAll "nfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-spec:
- ports:
- - name: nfs
- port: 2049
- - name: mountd
- port: 20048
- - name: rpcbind
- port: 111
- - name: rpcbind-udp
- port: 111
- protocol: UDP
- selector:
-{{ tuple $envAll "nfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-{{- end }}
diff --git a/nfs-provisioner/templates/storage_class.yaml b/nfs-provisioner/templates/storage_class.yaml
deleted file mode 100644
index 5a6ce76f93..0000000000
--- a/nfs-provisioner/templates/storage_class.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/*
-Copyright 2017 The Openstack-Helm Authors.
-
-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.storage_class }}
-{{- $envAll := . }}
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
- name: {{ .Values.storageclass.name }}
-provisioner: {{ .Values.storageclass.provisioner }}
-parameters:
- mountOptions: "vers=4.1"
-{{- end }}
diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml
deleted file mode 100644
index 9c69e9cb02..0000000000
--- a/nfs-provisioner/values.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
-# 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 NFS.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-pod:
- affinity:
- anti:
- type:
- default: preferredDuringSchedulingIgnoredDuringExecution
- topologyKey:
- default: kubernetes.io/hostname
- replicas:
- #only 1 replica currently supported
- server: 1
- resources:
- enabled: false
- server:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
-
-images:
- tags:
- nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.8
- pull_policy: IfNotPresent
-
-storage:
- host:
- host_path: /var/lib/openstack-helm/nfs
-
-labels:
- node_selector_key: openstack-control-plane
- node_selector_value: enabled
-
-storageclass:
- provisioner: example.com/nfs
- name: general
-
-endpoints:
- cluster_domain_suffix: cluster.local
- nfs:
- hosts:
- default: nfs-provisioner
- host_fqdn_override:
- default: null
- path: null
- scheme: null
- port:
- nfs:
- default: null
-
-manifests:
- deployment: true
- service: true
- storage_class: true