From 1f08ec62d3b27db19b3616d5b877cdd30628f058 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Fri, 2 Aug 2019 16:06:46 -0500 Subject: [PATCH] Delete v1.0dev type Change-Id: Ib31f0ca0866d3744f22498cee28bd46db5480259 --- .../v1.0dev/network/KubernetesNetwork.yaml | 101 ------------------ .../software/charts/ucp/drydock/maas.yaml | 29 ----- .../charts/ucp/promenade/promenade.yaml | 44 -------- .../v1.0dev/network/KubernetesNetwork.yaml | 87 --------------- 4 files changed, 261 deletions(-) delete mode 100644 deployment_files/type/single-node-proxy/v1.0dev/network/KubernetesNetwork.yaml delete mode 100644 deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/drydock/maas.yaml delete mode 100644 deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/promenade/promenade.yaml delete mode 100644 deployment_files/type/single-node/v1.0dev/network/KubernetesNetwork.yaml diff --git a/deployment_files/type/single-node-proxy/v1.0dev/network/KubernetesNetwork.yaml b/deployment_files/type/single-node-proxy/v1.0dev/network/KubernetesNetwork.yaml deleted file mode 100644 index 6dbe210a..00000000 --- a/deployment_files/type/single-node-proxy/v1.0dev/network/KubernetesNetwork.yaml +++ /dev/null @@ -1,101 +0,0 @@ ---- -schema: promenade/KubernetesNetwork/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-network - layeringDefinition: - abstract: false - layer: type - storagePolicy: cleartext - substitutions: - # DNS - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.cluster_domain - dest: - path: .dns.cluster_domain - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.service_ip - dest: - path: .dns.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.upstream_servers - dest: - path: .dns.upstream_servers - - # HTTP Proxy config - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.https - dest: - path: .proxy.url - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.no_proxy - dest: - path: .proxy.additional_no_proxy[0] - - # Kubernetes IPs - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.api_service_ip - dest: - path: .kubernetes.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.pod_cidr - dest: - path: .kubernetes.pod_cidr - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.service_cidr - dest: - path: .kubernetes.service_cidr - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.etcd_service_ip - dest: - path: .etcd.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .etcd.container_port - dest: - path: .etcd.container_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .etcd.haproxy_port - dest: - path: .etcd.haproxy_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.apiserver_port - dest: - path: .kubernetes.apiserver_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.haproxy_port - dest: - path: .kubernetes.haproxy_port - -data: - dns: - bootstrap_validation_checks: - - calico-etcd.kube-system.svc.cluster.local - - kubernetes-etcd.kube-system.svc.cluster.local - - kubernetes.default.svc.cluster.local -... diff --git a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/drydock/maas.yaml b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/drydock/maas.yaml deleted file mode 100644 index 012bb22b..00000000 --- a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/drydock/maas.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-maas - replacement: true - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: ucp-maas - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.https - dest: - path: .values.conf.maas.proxy.proxy_server -data: - values: - conf: - maas: - proxy: - proxy_enabled: 'true' -... diff --git a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/promenade/promenade.yaml b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/promenade/promenade.yaml deleted file mode 100644 index af2d658f..00000000 --- a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/promenade/promenade.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-promenade - replacement: true - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: ucp-promenade - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - # HTTP Proxy env - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.http - dest: - path: .values.pod.env.promenade_api[0].value - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.https - dest: - path: .values.pod.env.promenade_api[1].value - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .proxy.no_proxy - dest: - path: .values.pod.env.promenade_api[2].value -data: - values: - pod: - env: - promenade_api: - - name: http_proxy - - name: https_proxy - - name: no_proxy -... diff --git a/deployment_files/type/single-node/v1.0dev/network/KubernetesNetwork.yaml b/deployment_files/type/single-node/v1.0dev/network/KubernetesNetwork.yaml deleted file mode 100644 index 4903556f..00000000 --- a/deployment_files/type/single-node/v1.0dev/network/KubernetesNetwork.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -schema: promenade/KubernetesNetwork/v1 -metadata: - schema: metadata/Document/v1 - name: kubernetes-network - layeringDefinition: - abstract: false - layer: type - storagePolicy: cleartext - substitutions: - # DNS - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.cluster_domain - dest: - path: .dns.cluster_domain - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.service_ip - dest: - path: .dns.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .dns.upstream_servers - dest: - path: .dns.upstream_servers - - # Kubernetes IPs - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.api_service_ip - dest: - path: .kubernetes.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.pod_cidr - dest: - path: .kubernetes.pod_cidr - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.service_cidr - dest: - path: .kubernetes.service_cidr - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.etcd_service_ip - dest: - path: .etcd.service_ip - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .etcd.container_port - dest: - path: .etcd.container_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .etcd.haproxy_port - dest: - path: .etcd.haproxy_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.apiserver_port - dest: - path: .kubernetes.apiserver_port - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .kubernetes.haproxy_port - dest: - path: .kubernetes.haproxy_port - -data: - dns: - bootstrap_validation_checks: - - calico-etcd.kube-system.svc.cluster.local - - kubernetes-etcd.kube-system.svc.cluster.local - - kubernetes.default.svc.cluster.local -...