github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32452 from MrHohn/revert-32018-kubedns-deployment

Browse Source 
Revert "Use a Deployment for kube-dns"
This commit is contained in:
Marek Grabowski
2016-09-12 09:59:06 +02:00
committed by GitHub
parent ff1cec99cc dce1c06ad3
commit cc330692ba
5 changed files with 42 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/addons/dns/skydns-rc.yaml.base
View File

@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# __MACHINE_GENERATED_WARNING__
apiVersion: extensions/v1beta1
kind: Deployment
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -28,9 +30,8 @@ metadata:
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
matchLabels:
k8s-app: kube-dns
version: v19
k8s-app: kube-dns
version: v19
template:
metadata:
labels:

11
cluster/addons/dns/skydns-rc.yaml.in
View File

@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: extensions/v1beta1
kind: Deployment
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -28,9 +30,8 @@ metadata:
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
matchLabels:
k8s-app: kube-dns
version: v19
k8s-app: kube-dns
version: v19
template:
metadata:
labels:

11
cluster/addons/dns/skydns-rc.yaml.sed
View File

@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: extensions/v1beta1
kind: Deployment
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -28,9 +30,8 @@ metadata:
spec:
replicas: $DNS_REPLICAS
selector:
matchLabels:
k8s-app: kube-dns
version: v19
k8s-app: kube-dns
version: v19
template:
metadata:
labels: