Merge pull request #123590 from aojea/revert-123310-update/dns/v1.23.0
Revert "Update kubedns and nodelocaldns to v1.23.0"
This commit is contained in:
		@@ -114,7 +114,7 @@ spec:
 | 
			
		||||
        kubernetes.io/os: linux
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: kubedns
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
 | 
			
		||||
        resources:
 | 
			
		||||
          # TODO: Set memory limits when we've profiled the container for large
 | 
			
		||||
          # clusters, then set request = limit to keep this container in
 | 
			
		||||
@@ -170,7 +170,7 @@ spec:
 | 
			
		||||
          runAsUser: 1001
 | 
			
		||||
          runAsGroup: 1001
 | 
			
		||||
      - name: dnsmasq
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /healthcheck/dnsmasq
 | 
			
		||||
@@ -217,7 +217,7 @@ spec:
 | 
			
		||||
              - NET_BIND_SERVICE
 | 
			
		||||
              - SETGID
 | 
			
		||||
      - name: sidecar
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /metrics
 | 
			
		||||
 
 | 
			
		||||
@@ -114,7 +114,7 @@ spec:
 | 
			
		||||
        kubernetes.io/os: linux
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: kubedns
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
 | 
			
		||||
        resources:
 | 
			
		||||
          # TODO: Set memory limits when we've profiled the container for large
 | 
			
		||||
          # clusters, then set request = limit to keep this container in
 | 
			
		||||
@@ -170,7 +170,7 @@ spec:
 | 
			
		||||
          runAsUser: 1001
 | 
			
		||||
          runAsGroup: 1001
 | 
			
		||||
      - name: dnsmasq
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /healthcheck/dnsmasq
 | 
			
		||||
@@ -217,7 +217,7 @@ spec:
 | 
			
		||||
              - NET_BIND_SERVICE
 | 
			
		||||
              - SETGID
 | 
			
		||||
      - name: sidecar
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /metrics
 | 
			
		||||
 
 | 
			
		||||
@@ -114,7 +114,7 @@ spec:
 | 
			
		||||
        kubernetes.io/os: linux
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: kubedns
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
 | 
			
		||||
        resources:
 | 
			
		||||
          # TODO: Set memory limits when we've profiled the container for large
 | 
			
		||||
          # clusters, then set request = limit to keep this container in
 | 
			
		||||
@@ -170,7 +170,7 @@ spec:
 | 
			
		||||
          runAsUser: 1001
 | 
			
		||||
          runAsGroup: 1001
 | 
			
		||||
      - name: dnsmasq
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /healthcheck/dnsmasq
 | 
			
		||||
@@ -217,7 +217,7 @@ spec:
 | 
			
		||||
              - NET_BIND_SERVICE
 | 
			
		||||
              - SETGID
 | 
			
		||||
      - name: sidecar
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
 | 
			
		||||
        livenessProbe:
 | 
			
		||||
          httpGet:
 | 
			
		||||
            path: /metrics
 | 
			
		||||
 
 | 
			
		||||
@@ -138,7 +138,7 @@ spec:
 | 
			
		||||
        operator: "Exists"
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: node-cache
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-node-cache:1.23.0
 | 
			
		||||
        image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.28
 | 
			
		||||
        resources:
 | 
			
		||||
          requests:
 | 
			
		||||
            cpu: 25m
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user