Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrislovecnm
chrislovecnm committed Jul 20, 2017
2 parents cbad385 + 42f621d commit cfe1427
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 35 deletions.
89 changes: 89 additions & 0 deletions docs/releases/1.7-NOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,92 @@ _This is a WIP document describing changes to the upcoming kops 1.7 release_
# Required Actions

* Existing Calico users on clusters that were created prior to kops 1.7 are suspectible to IP conflict between Pods and Services due to an overlap of the two IP ranges. Migration to a new Pod CIDR is recommended, and is a manual procedure due to risk of potential downtime during this operation. For the migration procedure, please refer to [this document](../upgrade_from_kops_1.6_to_1.7_calico_cidr_migration.md).



# Full changelist

* alpha channel: Bump k8s version to 1.6.6 [@justinsb](https://github.com/justinsb) [#2788](https://github.com/kubernetes/kops/pull/2788)
* Add release notes for 1.6.2 [@justinsb](https://github.com/justinsb) [#2786](https://github.com/kubernetes/kops/pull/2786)
* Support generated clientset as alternative to vfs clientset [@justinsb](https://github.com/justinsb) [#2622](https://github.com/kubernetes/kops/pull/2622)
* Change to EtcdBuilder in ETCD model [@shamil](https://github.com/shamil) [#2813](https://github.com/kubernetes/kops/pull/2813)
* fixing govet issues and adding test directory [@chrislovecnm](https://github.com/chrislovecnm) [#2805](https://github.com/kubernetes/kops/pull/2805)
* removing comments that are not longer generated [@chrislovecnm](https://github.com/chrislovecnm) [#2799](https://github.com/kubernetes/kops/pull/2799)
* single-to-multi-master doc: Create all master instances groups at first [@dtan4](https://github.com/dtan4) [#2774](https://github.com/kubernetes/kops/pull/2774)
* Bump canal addon version [@trthomps](https://github.com/trthomps) [#2823](https://github.com/kubernetes/kops/pull/2823)
* fixing bug with using shell flag [@chrislovecnm](https://github.com/chrislovecnm) [#2843](https://github.com/kubernetes/kops/pull/2843)
* Fix missing ids in a few log messages [@justinsb](https://github.com/justinsb) [#2836](https://github.com/kubernetes/kops/pull/2836)
* Documentation updates including using YAML and API [@chrislovecnm](https://github.com/chrislovecnm) [#2795](https://github.com/kubernetes/kops/pull/2795)
* Change logrotate compress to delaycompress to prevent fluentd log tailing from getting stuck [@r4j4h](https://github.com/r4j4h) [#2835](https://github.com/kubernetes/kops/pull/2835)
* Setting versions for go and kubectl in protokube [@chrislovecnm](https://github.com/chrislovecnm) [#2814](https://github.com/kubernetes/kops/pull/2814)
* Kubelet / Master Authentication Options [@gambol99](https://github.com/gambol99) [#2831](https://github.com/kubernetes/kops/pull/2831)
* Lock kubectl version [@justinsb](https://github.com/justinsb) [#2849](https://github.com/kubernetes/kops/pull/2849)
* Add field to enable EBS Volume Optimization [@austinmoore-](https://github.com/austinmoore-) [#2822](https://github.com/kubernetes/kops/pull/2822)
* Added documentation for vSphere support status. [@prashima](https://github.com/prashima) [#2850](https://github.com/kubernetes/kops/pull/2850)
* Propose awsudo as a workaround for kops mfa [@max-lobur](https://github.com/max-lobur) [#2791](https://github.com/kubernetes/kops/pull/2791)
* Have kops 1.7 use k8s 1.7 [@justinsb](https://github.com/justinsb) [#2838](https://github.com/kubernetes/kops/pull/2838)
* Upgrade kube-dns for 1.7 [@justinsb](https://github.com/justinsb) [#2839](https://github.com/kubernetes/kops/pull/2839)
* Update our dependencies to the release-1.7 branch versions [@justinsb](https://github.com/justinsb) [#2840](https://github.com/kubernetes/kops/pull/2840)
* instructions for gossip-based cluster [@arun-gupta](https://github.com/arun-gupta) [#2853](https://github.com/kubernetes/kops/pull/2853)
* fixing a typo [@arun-gupta](https://github.com/arun-gupta) [#2854](https://github.com/kubernetes/kops/pull/2854)
* Fix typos in kops_upgrade.md [@aknuds1](https://github.com/aknuds1) [#2815](https://github.com/kubernetes/kops/pull/2815)
* Makefile targets for go 1.8 & 1.9 [@justinsb](https://github.com/justinsb) [#2848](https://github.com/kubernetes/kops/pull/2848)
* review doc on creating instance group [@gianrubio](https://github.com/gianrubio) [#2872](https://github.com/kubernetes/kops/pull/2872)
* increase default instance root volume size [@chrislovecnm](https://github.com/chrislovecnm) [#2847](https://github.com/kubernetes/kops/pull/2847)
* Add comment for Subnets field [@justinsb](https://github.com/justinsb) [#2874](https://github.com/kubernetes/kops/pull/2874)
* Update docs for new volume sizes [@justinsb](https://github.com/justinsb) [#2873](https://github.com/kubernetes/kops/pull/2873)
* Doc fixes [@chrislovecnm](https://github.com/chrislovecnm) [#2865](https://github.com/kubernetes/kops/pull/2865)
* Initial support for authentication (kopeio) [@justinsb](https://github.com/justinsb) [#2773](https://github.com/kubernetes/kops/pull/2773)
* Add SG parameter into AWS cloud-config [@alexandrst88](https://github.com/alexandrst88) [#2808](https://github.com/kubernetes/kops/pull/2808)
* Update calico to use the correct CIDR for pods [@ottoyiu](https://github.com/ottoyiu) [#2768](https://github.com/kubernetes/kops/pull/2768)
* Bump dns-controller & kops for 1.7.0-alpha.1 [@justinsb](https://github.com/justinsb) [#2880](https://github.com/kubernetes/kops/pull/2880)
* Properly set IAM prefix for GovCloud #2887 [@amdonov](https://github.com/amdonov) [#2888](https://github.com/kubernetes/kops/pull/2888)
* vendor github.com/digitalocean/godo [@andrewsykim](https://github.com/andrewsykim) [#2891](https://github.com/kubernetes/kops/pull/2891)
* vendor github.com/google/go-querystring and github.com/tent/http-link-go [@andrewsykim](https://github.com/andrewsykim) [#2892](https://github.com/kubernetes/kops/pull/2892)
* Corrected spelling of ClusterSpec in README.md. [@jburnham](https://github.com/jburnham) [#2898](https://github.com/kubernetes/kops/pull/2898)
* Asset redirection via manifest parsing [@justinsb](https://github.com/justinsb) [#2769](https://github.com/kubernetes/kops/pull/2769)
* bump kubernetes dashboard version [@gianrubio](https://github.com/gianrubio) [#2789](https://github.com/kubernetes/kops/pull/2789)
* fixing remapping, as it was not returning the remapped data [@chrislovecnm](https://github.com/chrislovecnm) [#2905](https://github.com/kubernetes/kops/pull/2905)
* Add omitempty json tag to resolvConf fields [@austinmoore-](https://github.com/austinmoore-) [#2916](https://github.com/kubernetes/kops/pull/2916)
* Fix a documentation instance group doc typo [@erickt](https://github.com/erickt) [#2910](https://github.com/kubernetes/kops/pull/2910)
* Fixing wrong brackets on links [@chrislovecnm](https://github.com/chrislovecnm) [#2884](https://github.com/kubernetes/kops/pull/2884)
* add registryMirrors [@qqshfox](https://github.com/qqshfox) [#2893](https://github.com/kubernetes/kops/pull/2893)
* Add instructions for deleting cluster [@danielbryantuk](https://github.com/danielbryantuk) [#2902](https://github.com/kubernetes/kops/pull/2902)
* Start 1.7 release notes [@justinsb](https://github.com/justinsb) [#2875](https://github.com/kubernetes/kops/pull/2875)
* Increase fs.inotify.max_user_instances limit. Fixes #2912 [@steelecliftonberry](https://github.com/steelecliftonberry) [#2913](https://github.com/kubernetes/kops/pull/2913)
* fix cniAsset from env var [@qqshfox](https://github.com/qqshfox) [#2897](https://github.com/kubernetes/kops/pull/2897)
* Trivial doc tidying. [@rk295](https://github.com/rk295) [#2686](https://github.com/kubernetes/kops/pull/2686)
* kube-proxy: set hostname-override on AWS [@justinsb](https://github.com/justinsb) [#2936](https://github.com/kubernetes/kops/pull/2936)
* correct misspelling "device" for vsphere/vsphere_cloud.go [@fate-grand-order](https://github.com/fate-grand-order) [#2932](https://github.com/kubernetes/kops/pull/2932)
* Doc fixes [@mrtyler](https://github.com/mrtyler) [#2931](https://github.com/kubernetes/kops/pull/2931)
* Fix typos in create cluster docs [@benhartley](https://github.com/benhartley) [#2935](https://github.com/kubernetes/kops/pull/2935)
* fix delete_cluster for those regions don't have route53 [@qqshfox](https://github.com/qqshfox) [#2940](https://github.com/kubernetes/kops/pull/2940)
* Update weave to 2.0.1 [@marccarre](https://github.com/marccarre) [#2829](https://github.com/kubernetes/kops/pull/2829)
* Query for available instance types [@justinsb](https://github.com/justinsb) [#2837](https://github.com/kubernetes/kops/pull/2837)
* digitalocean feature flag [@andrewsykim](https://github.com/andrewsykim) [#2929](https://github.com/kubernetes/kops/pull/2929)
* Updating ingress-controller, default-backend and fixing permission for ClusterRole [@BradErz](https://github.com/BradErz) [#2896](https://github.com/kubernetes/kops/pull/2896)
* Dedent weave manifest, for easier diffing [@justinsb](https://github.com/justinsb) [#2945](https://github.com/kubernetes/kops/pull/2945)
* Typos and add note about need for --dns-zone [@deinspanjer](https://github.com/deinspanjer) [#2817](https://github.com/kubernetes/kops/pull/2817)
* digitalocean support -- dns provider [@andrewsykim](https://github.com/andrewsykim) [#2864](https://github.com/kubernetes/kops/pull/2864)
* Reduce size of images using debian-base [@aledbf](https://github.com/aledbf) [#2885](https://github.com/kubernetes/kops/pull/2885)
* Fix test breakage by PRs that crossed [@justinsb](https://github.com/justinsb) [#2948](https://github.com/kubernetes/kops/pull/2948)
* Fixes #2708 broken kubernetes-dashboard due to RBAC [@BradErz](https://github.com/BradErz) [#2949](https://github.com/kubernetes/kops/pull/2949)
* Restore removed submodules [@justinsb](https://github.com/justinsb) [#2946](https://github.com/kubernetes/kops/pull/2946)
* support china region [@qqshfox](https://github.com/qqshfox) [#2947](https://github.com/kubernetes/kops/pull/2947)
* Fix swallowed errors in upup subdirectory. [@alrs](https://github.com/alrs) [#2951](https://github.com/kubernetes/kops/pull/2951)
* Fix swallowed errors under pkg subdirectory. [@alrs](https://github.com/alrs) [#2957](https://github.com/kubernetes/kops/pull/2957)
* Fix swallowed err in federation. [@alrs](https://github.com/alrs) [#2952](https://github.com/kubernetes/kops/pull/2952)
* Try adding header to generated CLI docs [@justinsb](https://github.com/justinsb) [#2944](https://github.com/kubernetes/kops/pull/2944)
* Fixed unused import in tests. [@alrs](https://github.com/alrs) [#2953](https://github.com/kubernetes/kops/pull/2953)
* Example of how to do bash in our CLI help [@justinsb](https://github.com/justinsb) [#2943](https://github.com/kubernetes/kops/pull/2943)
* Add back integration tests into CI [@justinsb](https://github.com/justinsb) [#2958](https://github.com/kubernetes/kops/pull/2958)
* Unsetting the variable in the Make file [@BradErz](https://github.com/BradErz) [#2962](https://github.com/kubernetes/kops/pull/2962)
* Fixes #2535. [@rdtr](https://github.com/rdtr) [#2549](https://github.com/kubernetes/kops/pull/2549)
* Update generated apimachinery [@justinsb](https://github.com/justinsb) [#2965](https://github.com/kubernetes/kops/pull/2965)
* Cleaner yaml formatting [@justinsb](https://github.com/justinsb) [#2967](https://github.com/kubernetes/kops/pull/2967)
* Release notes for Calico Pod CIDR changes made in #2768 [@ottoyiu](https://github.com/ottoyiu) [#2911](https://github.com/kubernetes/kops/pull/2911)
* Initial work on kops-server [@justinsb](https://github.com/justinsb) [#2766](https://github.com/kubernetes/kops/pull/2766)
* Issue #2977: Improve Manifest documentation [@StevenACoffman](https://github.com/StevenACoffman) [#2981](https://github.com/kubernetes/kops/pull/2981)
* Add a feature flag for formatting assets [@justinsb](https://github.com/justinsb) [#2968](https://github.com/kubernetes/kops/pull/2968)
* protokube changes for allowing running a custom etcd container [@chrislovecnm](https://github.com/chrislovecnm) [#2966](https://github.com/kubernetes/kops/pull/2966)
* versioning kops-server container, and changing container [@chrislovecnm](https://github.com/chrislovecnm) [#2985](https://github.com/kubernetes/kops/pull/2985)
1 change: 1 addition & 0 deletions nodeup/pkg/model/protokube.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ func (t *ProtokubeBuilder) ProtokubeEnvironmentVariables() string {
}

if os.Getenv("S3_ENDPOINT") != "" {

buffer.WriteString(" ")
buffer.WriteString("-e S3_ENDPOINT=")
buffer.WriteString("'")
Expand Down
86 changes: 54 additions & 32 deletions pkg/model/bootstrapscript.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@ limitations under the License.
package model

import (
"bytes"
"fmt"
"os"
"strconv"
"strings"
"text/template"

"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/nodeup"
"k8s.io/kops/pkg/model/resources"
"k8s.io/kops/upup/pkg/fi"
"os"
"strconv"
"text/template"
)

// BootstrapScript creates the bootstrap script
Expand Down Expand Up @@ -73,45 +76,64 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, ps *kops.Egress
return ""
},

"AWS_REGION": func() string {
if os.Getenv("AWS_REGION") != "" {
return fmt.Sprintf("export AWS_REGION=%s\n",
os.Getenv("AWS_REGION"))
}
return ""
},
"ProxyEnv": func() string {
scriptSnippet := ""
var buffer bytes.Buffer

if ps != nil && ps.HTTPProxy.Host != "" {
httpProxyUrl := "http://"
if ps.HTTPProxy.User != "" {
var httpProxyUrl string

// TODO double check that all the code does this
// TODO move this into a validate so we can enforce the string syntax
if !strings.HasPrefix(httpProxyUrl, "http://") {
httpProxyUrl = "http://"
}

// TODO test and implement this
/* if ps.HTTPProxy.User != "" {
httpProxyUrl += ps.HTTPProxy.User
if ps.HTTPProxy.Password != "" {
httpProxyUrl += "@" + ps.HTTPProxy.Password
}
}*/

if ps.HTTPProxy.Port != 0 {
httpProxyUrl += ps.HTTPProxy.Host + ":" + strconv.Itoa(ps.HTTPProxy.Port)
} else {
httpProxyUrl += ps.HTTPProxy.Host
}
httpProxyUrl += ps.HTTPProxy.Host + ":" + strconv.Itoa(ps.HTTPProxy.Port)
scriptSnippet =
"export http_proxy=" + httpProxyUrl + "\n" +
"export https_proxy=${http_proxy}\n" +
"export ftp_proxy=${http_proxy}\n" +
"export no_proxy=" + ps.ProxyExcludes + "\n" +
"echo \"export http_proxy=${http_proxy}\" >> /etc/default/docker\n" +
"echo \"export https_proxy=${http_proxy}\" >> /etc/default/docker\n" +
"echo \"export ftp_proxy=${http_proxy}\" >> /etc/default/docker\n" +
"echo \"export no_proxy=${no_proxy}\" >> /etc/default/docker\n" +
"echo \"export http_proxy=${http_proxy}\" >> /etc/environment\n" +
"echo \"export https_proxy=${http_proxy}\" >> /etc/environment\n" +
"echo \"export ftp_proxy=${http_proxy}\" >> /etc/environment\n" +
"echo \"export no_proxy=${no_proxy}\" >> /etc/environment\n" +
"echo DefaultEnvironment=\\\"http_proxy=${http_proxy}\\\" \\\"https_proxy=${http_proxy}\\\" \\\"ftp_proxy=${http_proxy}\\\" \\\"no_proxy=${no_proxy}\\\" >> /etc/systemd/system.conf\n" +
"systemctl daemon-reload\n" +
"systemctl daemon-reexec\n" +
"echo \"Acquire::http::Proxy \\\"${http_proxy}\\\";\" > /etc/apt/apt.conf.d/30proxy\n\n"

// TODO handle other releases besides Ubuntu, Debian, RHEL and Centos

buffer.WriteString("export http_proxy=" + httpProxyUrl + "\n")
buffer.WriteString("export https_proxy=${http_proxy}\n")
buffer.WriteString("export ftp_proxy=${http_proxy}\n")
buffer.WriteString("export no_proxy=" + ps.ProxyExcludes + "\n")
buffer.WriteString("echo \"export http_proxy=${http_proxy}\" >> /etc/default/docker\n")
buffer.WriteString("echo \"export https_proxy=${http_proxy}\" >> /etc/default/docker\n")
buffer.WriteString("echo \"export ftp_proxy=${http_proxy}\" >> /etc/default/docker\n")
buffer.WriteString("echo \"export no_proxy=${no_proxy}\" >> /etc/default/docker\n")
buffer.WriteString("echo \"export http_proxy=${http_proxy}\" >> /etc/environment\n")
buffer.WriteString("echo \"export https_proxy=${http_proxy}\" >> /etc/environment\n")
buffer.WriteString("echo \"export ftp_proxy=${http_proxy}\" >> /etc/environment\n")
buffer.WriteString("echo \"export no_proxy=${no_proxy}\" >> /etc/environment\n")
buffer.WriteString("echo DefaultEnvironment=\\\"http_proxy=${http_proxy}\\\" \\\"https_proxy=${http_proxy}\\\" \\\"ftp_proxy=${http_proxy}\\\" \\\"no_proxy=${no_proxy}\\\" >> /etc/systemd/system.conf\n")
buffer.WriteString("systemctl daemon-reload\n")
buffer.WriteString("systemctl daemon-reexec\n")
buffer.WriteString("if [ -f /etc/lsb-release ] || [ -f /etc/debian_version ]; then\n")
buffer.WriteString(" echo \"Acquire::http::Proxy \\\"${http_proxy}\\\";\" > /etc/apt/apt.conf.d/30proxy\n")
buffer.WriteString("elif [ -f /etc/redhat-release ]; then\n")
buffer.WriteString(" echo \"http_proxy=\"${http_proxy}\" >> /etc/yum.conf\n")
buffer.WriteString("fi\n")
}
return scriptSnippet
return buffer.String()
},
"AWS_REGION": func() string {
if os.Getenv("AWS_REGION") != "" {
return fmt.Sprintf("export AWS_REGION=%s\n",
os.Getenv("AWS_REGION"))
}
return ""
},
}

Expand Down
4 changes: 2 additions & 2 deletions upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ spec:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
{{ end }}
{{- if .EgressProxy -}}
{{- if .EgressProxy }}
env:
{{ range $name, $value := ProxyEnv }}
- name: {{ $name }}
value: {{ $value }}
{{ end }}
{{- end -}}
{{- end }}
resources:
requests:
cpu: 50m
Expand Down
4 changes: 3 additions & 1 deletion util/pkg/vfs/s3context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,9 @@ func (s *S3Context) getRegionForBucket(bucket string) (string, error) {
var response *s3.GetBucketLocationOutput

s3Client, err := s.getClient(awsRegion)

if err != nil {
return "", fmt.Errorf("error connecting to S3: %s", err)
}
// Attempt one GetBucketLocation call the "normal" way (i.e. as the bucket owner)
response, err = s3Client.GetBucketLocation(request)

Expand Down

0 comments on commit cfe1427

Please sign in to comment.