mirror of https://github.com/kubernetes/kops.git
				
				
				
			Mark release 1.11.0-alpha.1
This commit is contained in:
		
							parent
							
								
									be291eea86
								
							
						
					
					
						commit
						30e2adcf92
					
				
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							| 
						 | 
					@ -54,7 +54,7 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
 | 
				
			||||||
unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY VSPHERE_USERNAME VSPHERE_PASSWORD
 | 
					unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY VSPHERE_USERNAME VSPHERE_PASSWORD
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
 | 
					# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
 | 
				
			||||||
DNS_CONTROLLER_TAG=1.10.0
 | 
					DNS_CONTROLLER_TAG=1.11.0-alpha.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Keep in sync with logic in get_workspace_status
 | 
					# Keep in sync with logic in get_workspace_status
 | 
				
			||||||
# TODO: just invoke tools/get_workspace_status.sh?
 | 
					# TODO: just invoke tools/get_workspace_status.sh?
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,9 +17,6 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
None known at this time
 | 
					None known at this time
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Highlighted changes
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
(coming soon)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Full change list since 1.10.0 release
 | 
					# Full change list since 1.10.0 release
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(will be included with 1.11.0 beta releases)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@ metadata:
 | 
				
			||||||
  labels:
 | 
					  labels:
 | 
				
			||||||
    k8s-addon: dns-controller.addons.k8s.io
 | 
					    k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    k8s-app: dns-controller
 | 
					    k8s-app: dns-controller
 | 
				
			||||||
    version: v1.10.0
 | 
					    version: v1.11.0-alpha.1
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  replicas: 1
 | 
					  replicas: 1
 | 
				
			||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,7 @@ spec:
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        k8s-addon: dns-controller.addons.k8s.io
 | 
					        k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
        k8s-app: dns-controller
 | 
					        k8s-app: dns-controller
 | 
				
			||||||
        version: v1.10.0
 | 
					        version: v1.11.0-alpha.1
 | 
				
			||||||
      annotations:
 | 
					      annotations:
 | 
				
			||||||
        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
					        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
				
			||||||
        # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
 | 
					        # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
 | 
				
			||||||
| 
						 | 
					@ -33,7 +33,7 @@ spec:
 | 
				
			||||||
      serviceAccount: dns-controller
 | 
					      serviceAccount: dns-controller
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
      - name: dns-controller
 | 
					      - name: dns-controller
 | 
				
			||||||
        image: kope/dns-controller:1.10.0
 | 
					        image: kope/dns-controller:1.11.0-alpha.1
 | 
				
			||||||
        command:
 | 
					        command:
 | 
				
			||||||
{{ range $arg := DnsControllerArgv }}
 | 
					{{ range $arg := DnsControllerArgv }}
 | 
				
			||||||
        - "{{ $arg }}"
 | 
					        - "{{ $arg }}"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@ metadata:
 | 
				
			||||||
  labels:
 | 
					  labels:
 | 
				
			||||||
    k8s-addon: dns-controller.addons.k8s.io
 | 
					    k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    k8s-app: dns-controller
 | 
					    k8s-app: dns-controller
 | 
				
			||||||
    version: v1.10.0
 | 
					    version: v1.11.0-alpha.1
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
  replicas: 1
 | 
					  replicas: 1
 | 
				
			||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,7 @@ spec:
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        k8s-addon: dns-controller.addons.k8s.io
 | 
					        k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
        k8s-app: dns-controller
 | 
					        k8s-app: dns-controller
 | 
				
			||||||
        version: v1.10.0
 | 
					        version: v1.11.0-alpha.1
 | 
				
			||||||
      annotations:
 | 
					      annotations:
 | 
				
			||||||
        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
					        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
				
			||||||
        scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
 | 
					        scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
 | 
				
			||||||
| 
						 | 
					@ -28,7 +28,7 @@ spec:
 | 
				
			||||||
      hostNetwork: true
 | 
					      hostNetwork: true
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
      - name: dns-controller
 | 
					      - name: dns-controller
 | 
				
			||||||
        image: kope/dns-controller:1.10.0
 | 
					        image: kope/dns-controller:1.11.0-alpha.1
 | 
				
			||||||
        command:
 | 
					        command:
 | 
				
			||||||
{{ range $arg := DnsControllerArgv }}
 | 
					{{ range $arg := DnsControllerArgv }}
 | 
				
			||||||
        - "{{ $arg }}"
 | 
					        - "{{ $arg }}"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -284,7 +284,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 | 
				
			||||||
	if externalDNS == nil || !externalDNS.Disable {
 | 
						if externalDNS == nil || !externalDNS.Disable {
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			key := "dns-controller.addons.k8s.io"
 | 
								key := "dns-controller.addons.k8s.io"
 | 
				
			||||||
			version := "1.10.0"
 | 
								version := "1.11.0-alpha.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				location := key + "/pre-k8s-1.6.yaml"
 | 
									location := key + "/pre-k8s-1.6.yaml"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,14 +41,14 @@ spec:
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: k8s-1.6
 | 
					  - id: k8s-1.6
 | 
				
			||||||
    kubernetesVersion: '>=1.6.0'
 | 
					    kubernetesVersion: '>=1.6.0'
 | 
				
			||||||
    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
					    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: v1.7.0
 | 
					  - id: v1.7.0
 | 
				
			||||||
    kubernetesVersion: '>=1.7.0'
 | 
					    kubernetesVersion: '>=1.7.0'
 | 
				
			||||||
    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
					    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,14 +41,14 @@ spec:
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: k8s-1.6
 | 
					  - id: k8s-1.6
 | 
				
			||||||
    kubernetesVersion: '>=1.6.0'
 | 
					    kubernetesVersion: '>=1.6.0'
 | 
				
			||||||
    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
					    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: v1.7.0
 | 
					  - id: v1.7.0
 | 
				
			||||||
    kubernetesVersion: '>=1.7.0'
 | 
					    kubernetesVersion: '>=1.7.0'
 | 
				
			||||||
    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
					    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,14 +41,14 @@ spec:
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: k8s-1.6
 | 
					  - id: k8s-1.6
 | 
				
			||||||
    kubernetesVersion: '>=1.6.0'
 | 
					    kubernetesVersion: '>=1.6.0'
 | 
				
			||||||
    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
					    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: v1.7.0
 | 
					  - id: v1.7.0
 | 
				
			||||||
    kubernetesVersion: '>=1.7.0'
 | 
					    kubernetesVersion: '>=1.7.0'
 | 
				
			||||||
    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
					    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,14 +41,14 @@ spec:
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: k8s-1.6
 | 
					  - id: k8s-1.6
 | 
				
			||||||
    kubernetesVersion: '>=1.6.0'
 | 
					    kubernetesVersion: '>=1.6.0'
 | 
				
			||||||
    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
					    manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
 | 
				
			||||||
    name: dns-controller.addons.k8s.io
 | 
					    name: dns-controller.addons.k8s.io
 | 
				
			||||||
    selector:
 | 
					    selector:
 | 
				
			||||||
      k8s-addon: dns-controller.addons.k8s.io
 | 
					      k8s-addon: dns-controller.addons.k8s.io
 | 
				
			||||||
    version: 1.10.0
 | 
					    version: 1.11.0-alpha.1
 | 
				
			||||||
  - id: v1.7.0
 | 
					  - id: v1.7.0
 | 
				
			||||||
    kubernetesVersion: '>=1.7.0'
 | 
					    kubernetesVersion: '>=1.7.0'
 | 
				
			||||||
    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
					    manifest: storage-aws.addons.k8s.io/v1.7.0.yaml
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,8 +23,8 @@ var Version = KOPS_RELEASE_VERSION
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// These constants are parsed by build tooling - be careful about changing the formats
 | 
					// These constants are parsed by build tooling - be careful about changing the formats
 | 
				
			||||||
const (
 | 
					const (
 | 
				
			||||||
	KOPS_RELEASE_VERSION = "1.10.0"
 | 
						KOPS_RELEASE_VERSION = "1.11.0-alpha.1"
 | 
				
			||||||
	KOPS_CI_VERSION      = "1.10.1-alpha.1"
 | 
						KOPS_CI_VERSION      = "1.11.0-alpha.2"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// GitVersion should be replaced by the makefile
 | 
					// GitVersion should be replaced by the makefile
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue