kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into extra_user-data

This commit is contained in:
Rodrigo Menezes 2017-11-04 17:06:43 -07:00
parent 58faa71d89 40a94a7c98
commit 565afae2c6
360 changed files with 7358 additions and 1405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -70,3 +70,6 @@ bazel-out
bazel-testlogs
# Ignore default apiserver config
apiserver.local.config
# Ignore awesome_bot markdown links check output
ab-results-*.json

3
.travis.yml
View File

@ -2,7 +2,8 @@ language: go
go:
- 1.8
- 1.9
- tip
# removed because of govet issue with apimahcinery
# - tip
go_import_path: k8s.io/kops

9
Makefile
View File

@ -594,3 +594,12 @@ bazel-push-gce-run: bazel-push
.PHONY: bazel-push-aws-run
bazel-push-aws-run: bazel-push
ssh -t ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /tmp/nodeup --conf=/var/cache/kubernetes-install/kube_env.yaml --v=8
.PHONY: check-markdown-links
check-markdown-links:
docker run -t -v $$PWD:/tmp \
-e LC_ALL=C.UTF-8 \
-e LANG=en_US.UTF-8 \
-e LANGUAGE=en_US.UTF-8 \
rubygem/awesome_bot --allow-dupe --allow-redirect \
$(shell find $$PWD -name "*.md" -mindepth 1 -printf '%P\n' | grep -v vendor | grep -v _vendor | grep -v Changelog.md)

1
OWNERS
View File

@ -4,3 +4,4 @@ approvers:
- chrislovecnm
- zmerlynn
- andrewsykim
- geojaz

2
_vendor/github.com/gophercloud/gophercloud generated

@ -1 +1 @@
Subproject commit 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961
Subproject commit c7551a666c4fee120cc314dce91ba3d0663a86f3

2
addons/kube-state-metrics/README.md Normal file
View File

@ -0,0 +1,2 @@
## Usages
channels apply channel kube-state-metrics --yes

13
addons/kube-state-metrics/addon.yaml Normal file
View File

@ -0,0 +1,13 @@
kind: Addons
metadata:
name: kube-state-metrics
spec:
addons:
- version: 1.0.1
selector:
k8s-addon: kube-state-metrics.addons.k8s.io
manifest: v1.0.1.yaml
- version: v1.1.0-rc.0
selector:
k8s-addon: kube-state-metrics.addons.k8s.io
manifest: v1.1.0-rc.0.yaml

158
addons/kube-state-metrics/v1.0.1.yaml Normal file
View File

@ -0,0 +1,158 @@
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: kube-state-metrics
subjects:
- kind: ServiceAccount
name: kube-state-metrics
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: kube-state-metrics
rules:
- apiGroups: [""]
resources:
- nodes
- pods
- services
- resourcequotas
- replicationcontrollers
- limitranges
- persistentvolumeclaims
- namespaces
verbs: ["list", "watch"]
- apiGroups: ["extensions"]
resources:
- daemonsets
- deployments
- replicasets
verbs: ["list", "watch"]
- apiGroups: ["apps"]
resources:
- statefulsets
verbs: ["list", "watch"]
- apiGroups: ["batch"]
resources:
- cronjobs
- jobs
verbs: ["list", "watch"]
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-state-metrics
namespace: kube-system
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: kube-state-metrics
spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: quay.io/coreos/kube-state-metrics:v1.0.1
ports:
- name: http-metrics
containerPort: 8080
readinessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 5
timeoutSeconds: 5
resources:
requests:
memory: 100Mi
cpu: 100m
limits:
memory: 200Mi
cpu: 200m
- name: addon-resizer
image: gcr.io/google_containers/addon-resizer:1.0
resources:
limits:
cpu: 100m
memory: 30Mi
requests:
cpu: 100m
memory: 30Mi
env:
- name: MY_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: MY_POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
command:
- /pod_nanny
- --container=kube-state-metrics
- --cpu=100m
- --extra-cpu=1m
- --memory=100Mi
- --extra-memory=2Mi
- --threshold=5
- --deployment=kube-state-metrics
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
metadata:
name: kube-state-metrics
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: kube-state-metrics-resizer
subjects:
- kind: ServiceAccount
name: kube-state-metrics
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role
metadata:
namespace: kube-system
name: kube-state-metrics-resizer
rules:
- apiGroups: [""]
resources:
- pods
verbs: ["get"]
- apiGroups: ["extensions"]
resources:
- deployments
resourceNames: ["kube-state-metrics"]
verbs: ["get", "update"]
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: kube-state-metrics
namespace: kube-system
---
apiVersion: v1
kind: Service
metadata:
name: kube-state-metrics
namespace: kube-system
labels:
k8s-app: kube-state-metrics
annotations:
prometheus.io/scrape: 'true'
spec:
ports:
- name: http-metrics
port: 8080
targetPort: http-metrics
protocol: TCP
selector:
k8s-app: kube-state-metrics

158
addons/kube-state-metrics/v1.1.0-rc.0.yaml Normal file
View File

@ -0,0 +1,158 @@
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: kube-state-metrics
subjects:
- kind: ServiceAccount
name: kube-state-metrics
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: kube-state-metrics
rules:
- apiGroups: [""]
resources:
- nodes
- pods
- services
- resourcequotas
- replicationcontrollers
- limitranges
- persistentvolumeclaims
- namespaces
verbs: ["list", "watch"]
- apiGroups: ["extensions"]
resources:
- daemonsets
- deployments
- replicasets
verbs: ["list", "watch"]
- apiGroups: ["apps"]
resources:
- statefulsets
verbs: ["list", "watch"]
- apiGroups: ["batch"]
resources:
- cronjobs
- jobs
verbs: ["list", "watch"]
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-state-metrics
namespace: kube-system
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: kube-state-metrics
spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
image: quay.io/coreos/kube-state-metrics:v1.1.0-rc.0
ports:
- name: http-metrics
containerPort: 8080
readinessProbe:
httpGet:
path: /healthz
port: 8080
initialDelaySeconds: 5
timeoutSeconds: 5
resources:
requests:
memory: 100Mi
cpu: 100m
limits:
memory: 200Mi
cpu: 200m
- name: addon-resizer
image: gcr.io/google_containers/addon-resizer:1.0
resources:
limits:
cpu: 100m
memory: 30Mi
requests:
cpu: 100m
memory: 30Mi
env:
- name: MY_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: MY_POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
command:
- /pod_nanny
- --container=kube-state-metrics
- --cpu=100m
- --extra-cpu=1m
- --memory=100Mi
- --extra-memory=2Mi
- --threshold=5
- --deployment=kube-state-metrics
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
metadata:
name: kube-state-metrics
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: kube-state-metrics-resizer
subjects:
- kind: ServiceAccount
name: kube-state-metrics
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role
metadata:
namespace: kube-system
name: kube-state-metrics-resizer
rules:
- apiGroups: [""]
resources:
- pods
verbs: ["get"]
- apiGroups: ["extensions"]
resources:
- deployments
resourceNames: ["kube-state-metrics"]
verbs: ["get", "update"]
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: kube-state-metrics
namespace: kube-system
---
apiVersion: v1
kind: Service
metadata:
name: kube-state-metrics
namespace: kube-system
labels:
k8s-app: kube-state-metrics
annotations:
prometheus.io/scrape: 'true'
spec:
ports:
- name: http-metrics
port: 8080
targetPort: http-metrics
protocol: TCP
selector:
k8s-app: kube-state-metrics

7
addons/logging-elasticsearch/addon.yaml
View File

@ -7,4 +7,9 @@ spec:
selector:
k8s-addon: logging-elasticsearch.addons.k8s.io
manifest: v1.5.0.yaml
kubernetesVersion: ">=1.5.0" # We use statefulsets
kubernetesVersion: ">=1.5.0 <1.6.0" # We use statefulsets
- version: 1.6.0
selector:
k8s-addon: logging-elasticsearch.addons.k8s.io
manifest: v1.6.0.yaml
kubernetesVersion: ">=1.6.0" # RBAC v1beta1 is introduced as of v1.6.0

280
addons/logging-elasticsearch/v1.6.0.yaml Normal file
View File

@ -0,0 +1,280 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: elasticsearch-logging
namespace: kube-system
labels:
k8s-app: elasticsearch-logging
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: elasticsearch-logging
labels:
k8s-app: elasticsearch-logging
rules:
- apiGroups:
- ""
resources:
- "services"
- "namespaces"
- "endpoints"
verbs:
- "get"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
namespace: kube-system
name: elasticsearch-logging
labels:
k8s-app: elasticsearch-logging
subjects:
- kind: ServiceAccount
name: elasticsearch-logging
namespace: kube-system
apiGroup: ""
roleRef:
kind: ClusterRole
name: elasticsearch-logging
apiGroup: ""
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: fluentd-es
namespace: kube-system
labels:
k8s-app: fluentd-es
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: fluentd-es
labels:
k8s-app: fluentd-es
rules:
- apiGroups:
- ""
resources:
- "namespaces"
- "pods"
verbs:
- "get"
- "watch"
- "list"
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: fluentd-es
labels:
k8s-app: fluentd-es
subjects:
- kind: ServiceAccount
name: fluentd-es
namespace: kube-system
apiGroup: ""
roleRef:
kind: ClusterRole
name: fluentd-es
apiGroup: ""
---
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: fluentd-es
namespace: kube-system
labels:
k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: fluentd-es
kubernetes.io/cluster-service: "true"
version: v1.22
spec:
template:
metadata:
labels:
k8s-app: fluentd-es
kubernetes.io/cluster-service: "true"
version: v1.22
spec:
serviceAccountName: fluentd-es
containers:
- name: fluentd-es
image: gcr.io/google_containers/fluentd-elasticsearch:1.22
command:
- '/bin/sh'
- '-c'
- '/usr/sbin/td-agent 2>&1 >> /var/log/fluentd.log'
resources:
limits:
memory: 200Mi
requests:
cpu: 100m
memory: 200Mi
volumeMounts:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
#nodeSelector:
# alpha.kubernetes.io/fluentd-ds-ready: "true"
terminationGracePeriodSeconds: 30
volumes:
- name: varlog
hostPath:
path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
---
apiVersion: v1
kind: Service
metadata:
name: elasticsearch-logging
namespace: kube-system
labels:
k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: elasticsearch-logging
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "Elasticsearch"
spec:
ports:
- port: 9200
protocol: TCP
targetPort: db
selector:
k8s-app: elasticsearch-logging
---
apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
name: elasticsearch-logging
namespace: kube-system
labels:
k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: elasticsearch-logging
version: v1
kubernetes.io/cluster-service: "true"
spec:
serviceName: elasticsearch-logging
replicas: 2
template:
metadata:
labels:
k8s-app: elasticsearch-logging
version: v1
kubernetes.io/cluster-service: "true"
spec:
serviceAccountName: elasticsearch-logging
containers:
- image: gcr.io/google_containers/elasticsearch:v2.4.1-2
name: elasticsearch-logging
resources:
# need more cpu upon initialization, therefore burstable class
limits:
cpu: 1000m
requests:
cpu: 100m
ports:
- containerPort: 9200
name: db
protocol: TCP
- containerPort: 9300
name: transport
protocol: TCP
volumeMounts:
- name: es-persistent-storage
mountPath: /data
env:
- name: "NAMESPACE"
valueFrom:
fieldRef:
fieldPath: metadata.namespace
volumeClaimTemplates:
- metadata:
name: es-persistent-storage
annotations:
volume.beta.kubernetes.io/storage-class: "default"
spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: 20Gi
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kibana-logging
namespace: kube-system
labels:
k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: kibana-logging
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
matchLabels:
k8s-app: kibana-logging
template:
metadata:
labels:
k8s-app: kibana-logging
spec:
containers:
- name: kibana-logging
image: gcr.io/google_containers/kibana:v4.6.1-1
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
requests:
cpu: 100m
env:
- name: "ELASTICSEARCH_URL"
value: "http://elasticsearch-logging:9200"
- name: "KIBANA_BASE_URL"
value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging"
ports:
- containerPort: 5601
name: ui
protocol: TCP
---
apiVersion: v1
kind: Service
metadata:
name: kibana-logging
namespace: kube-system
labels:
k8s-addon: logging-elasticsearch.addons.k8s.io
k8s-app: kibana-logging
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "Kibana"
spec:
ports:
- port: 5601
protocol: TCP
targetPort: ui
selector:
k8s-app: kibana-logging

3
channels/cmd/channels/main.go
View File

@ -18,8 +18,9 @@ package main
import (
"fmt"
"k8s.io/kops/channels/pkg/cmd"
"os"
"k8s.io/kops/channels/pkg/cmd"
)
func main() {

3
channels/pkg/channels/addon.go
View File

@ -18,11 +18,12 @@ package channels
import (
"fmt"
"net/url"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/client-go/kubernetes"
"k8s.io/kops/channels/pkg/api"
"net/url"
)
// Addon is a wrapper around a single version of an addon

5
channels/pkg/channels/addons.go
View File

@ -18,13 +18,14 @@ package channels
import (
"fmt"
"net/url"
"strings"
"github.com/blang/semver"
"github.com/golang/glog"
"k8s.io/kops/channels/pkg/api"
"k8s.io/kops/upup/pkg/fi/utils"
"k8s.io/kops/util/pkg/vfs"
"net/url"
"strings"
)
type Addons struct {

3
channels/pkg/channels/addons_test.go
View File

@ -17,9 +17,10 @@ limitations under the License.
package channels
import (
"testing"
"github.com/blang/semver"
"k8s.io/kops/channels/pkg/api"
"testing"
)
func Test_Filtering(t *testing.T) {

5
channels/pkg/channels/apply.go
View File

@ -18,13 +18,14 @@ package channels
import (
"fmt"
"github.com/golang/glog"
"io/ioutil"
"k8s.io/kops/util/pkg/vfs"
"os"
"os/exec"
"path"
"strings"
"github.com/golang/glog"
"k8s.io/kops/util/pkg/vfs"
)
// Apply calls kubectl apply to apply the manifest.

3
channels/pkg/channels/channel_version.go
View File

@ -19,13 +19,14 @@ package channels
import (
"encoding/json"
"fmt"
"strings"
"github.com/blang/semver"
"github.com/golang/glog"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"strings"
)
const AnnotationPrefix = "addons.k8s.io/"

3
channels/pkg/cmd/apply.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package cmd
import (
"github.com/spf13/cobra"
"io"
"github.com/spf13/cobra"
)
func NewCmdApply(f Factory, out io.Writer) *cobra.Command {

9
channels/pkg/cmd/apply_channel.go
View File

@ -18,14 +18,15 @@ package cmd
import (
"fmt"
"github.com/blang/semver"
"github.com/spf13/cobra"
"io"
"k8s.io/kops/channels/pkg/channels"
"k8s.io/kops/util/pkg/tables"
"net/url"
"os"
"strings"
"github.com/blang/semver"
"github.com/spf13/cobra"
"k8s.io/kops/channels/pkg/channels"
"k8s.io/kops/util/pkg/tables"
)
type ApplyChannelOptions struct {

3
channels/pkg/cmd/get.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package cmd
import (
"github.com/spf13/cobra"
"io"
"github.com/spf13/cobra"
)
func NewCmdGet(f Factory, out io.Writer) *cobra.Command {

5
channels/pkg/cmd/get_addons.go
View File

@ -34,13 +34,14 @@ package cmd
import (
"fmt"
"github.com/spf13/cobra"
"io"
"os"
"github.com/spf13/cobra"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/channels/pkg/channels"
"k8s.io/kops/util/pkg/tables"
"os"
)
type GetAddonsOptions struct {

3
channels/pkg/cmd/root.go
View File

@ -20,9 +20,10 @@ import (
goflag "flag"
"fmt"
"io"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"io"
)
type CmdRootOptions struct {

3
cloudmock/aws/mockec2/address.go
View File

@ -19,10 +19,11 @@ package mockec2
import (
"encoding/binary"
"fmt"
"net"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"net"
)
func (m *MockEC2) AllocateAddressRequest(*ec2.AllocateAddressInput) (*request.Request, *ec2.AllocateAddressOutput) {

2
cloudmock/aws/mockec2/api.go
View File

@ -33,7 +33,7 @@ type MockEC2 struct {
SecurityGroups []*ec2.SecurityGroup
subnetNumber int
Subnets []*ec2.Subnet
subnets map[string]*subnetInfo
volumeNumber int
Volumes []*ec2.Volume

3
cloudmock/aws/mockec2/images.go
View File

@ -18,11 +18,12 @@ package mockec2
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
func (m *MockEC2) DescribeImageAttributeRequest(*ec2.DescribeImageAttributeInput) (*request.Request, *ec2.DescribeImageAttributeOutput) {

1
cloudmock/aws/mockec2/keypairs.go
View File

@ -18,6 +18,7 @@ package mockec2
import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"

3
cloudmock/aws/mockec2/securitygroups.go
View File

@ -18,10 +18,11 @@ package mockec2
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
func (m *MockEC2) CreateSecurityGroupRequest(*ec2.CreateSecurityGroupInput) (*request.Request, *ec2.CreateSecurityGroupOutput) {

43
cloudmock/aws/mockec2/subnets.go
View File

@ -18,12 +18,36 @@ package mockec2
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
type subnetInfo struct {
main ec2.Subnet
}
func (m *MockEC2) FindSubnet(id string) *ec2.Subnet {
subnet := m.subnets[id]
if subnet == nil {
return nil
}
copy := subnet.main
copy.Tags = m.getTags(ec2.ResourceTypeSubnet, id)
return &copy
}
func (m *MockEC2) SubnetIds() []string {
var ids []string
for id := range m.subnets {
ids = append(ids, id)
}
return ids
}
func (m *MockEC2) CreateSubnetRequest(*ec2.CreateSubnetInput) (*request.Request, *ec2.CreateSubnetOutput) {
panic("Not implemented")
return nil, nil
@ -40,7 +64,14 @@ func (m *MockEC2) CreateSubnet(request *ec2.CreateSubnetInput) (*ec2.CreateSubne
VpcId: request.VpcId,
CidrBlock: request.CidrBlock,
}
m.Subnets = append(m.Subnets, subnet)
if m.subnets == nil {
m.subnets = make(map[string]*subnetInfo)
}
m.subnets[*subnet.SubnetId] = &subnetInfo{
main: *subnet,
}
response := &ec2.CreateSubnetOutput{
Subnet: subnet,
}
@ -57,7 +88,7 @@ func (m *MockEC2) DescribeSubnets(request *ec2.DescribeSubnetsInput) (*ec2.Descr
var subnets []*ec2.Subnet
for _, subnet := range m.Subnets {
for id, subnet := range m.subnets {
allFiltersMatch := true
for _, filter := range request.Filters {
match := false
@ -65,7 +96,7 @@ func (m *MockEC2) DescribeSubnets(request *ec2.DescribeSubnetsInput) (*ec2.Descr
default:
if strings.HasPrefix(*filter.Name, "tag:") {
match = m.hasTag(ec2.ResourceTypeSubnet, *subnet.SubnetId, filter)
match = m.hasTag(ec2.ResourceTypeSubnet, *subnet.main.SubnetId, filter)
} else {
return nil, fmt.Errorf("unknown filter name: %q", *filter.Name)
}
@ -81,8 +112,8 @@ func (m *MockEC2) DescribeSubnets(request *ec2.DescribeSubnetsInput) (*ec2.Descr
continue
}
copy := *subnet
copy.Tags = m.getTags(ec2.ResourceTypeSubnet, *subnet.SubnetId)
copy := subnet.main
copy.Tags = m.getTags(ec2.ResourceTypeSubnet, id)
subnets = append(subnets, &copy)
}

16
cloudmock/aws/mockec2/tags.go
View File

@ -18,10 +18,13 @@ package mockec2
import (
"fmt"
"sort"
"strings"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
func (m *MockEC2) CreateTagsRequest(*ec2.CreateTagsInput) (*request.Request, *ec2.CreateTagsOutput) {
@ -165,3 +168,14 @@ func (m *MockEC2) DescribeTagsPages(*ec2.DescribeTagsInput, func(*ec2.DescribeTa
panic("Not implemented")
return nil
}
// SortTags sorts the slice of tags by Key
func SortTags(tags []*ec2.Tag) {
keys := make([]string, len(tags))
for i := range tags {
if tags[i] != nil {
keys[i] = aws.StringValue(tags[i].Key)
}
}
sort.SliceStable(tags, func(i, j int) bool { return keys[i] < keys[j] })
}

3
cloudmock/aws/mockec2/volumes.go
View File

@ -18,10 +18,11 @@ package mockec2
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
func (m *MockEC2) DescribeVolumeAttributeRequest(*ec2.DescribeVolumeAttributeInput) (*request.Request, *ec2.DescribeVolumeAttributeOutput) {

3
cloudmock/aws/mockec2/vpcs.go
View File

@ -18,11 +18,12 @@ package mockec2
import (
"fmt"
"strings"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"strings"
)
type vpcInfo struct {

3
cloudmock/aws/mockroute53/api.go
View File

@ -17,10 +17,11 @@ limitations under the License.
package mockroute53
import (
"strings"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/aws/aws-sdk-go/service/route53/route53iface"
"strings"
)
type zoneInfo struct {

1
cloudmock/aws/mockroute53/records.go
View File

@ -18,6 +18,7 @@ package mockroute53
import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/route53"

1
cloudmock/aws/mockroute53/zones.go
View File

@ -18,6 +18,7 @@ package mockroute53
import (
"fmt"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/golang/glog"

5
cmd/kops-server/main.go
View File

@ -21,11 +21,12 @@ import (
"os"
"runtime"
"math/rand"
"time"
"github.com/golang/glog"
"k8s.io/apiserver/pkg/util/logs"
"k8s.io/kops/pkg/apiserver/cmd/server"
"math/rand"
"time"
)
func main() {

1
cmd/kops/BUILD.bazel
View File

@ -91,6 +91,7 @@ go_library(
"//util/pkg/vfs:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
"//vendor/github.com/blang/semver:go_default_library",
"//vendor/github.com/ghodss/yaml:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/github.com/spf13/cobra/doc:go_default_library",

1
cmd/kops/create.go
View File

@ -130,6 +130,7 @@ func RunCreate(f *util.Factory, out io.Writer, c *CreateOptions) error {
return fmt.Errorf("error reading file %q: %v", f, err)
}
// TODO: this does not support a JSON array
sections := bytes.Split(contents, []byte("\n---\n"))
for _, section := range sections {
defaults := &schema.GroupVersionKind{

53
cmd/kops/create_cluster.go
View File

@ -28,6 +28,7 @@ import (
"github.com/golang/glog"
"github.com/spf13/cobra"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kops"
"k8s.io/kops/cmd/kops/util"
@ -124,6 +125,11 @@ type CreateClusterOptions struct {
// ConfigBase is the location where we will store the configuration, it defaults to the state store
ConfigBase string
// DryRun mode output a cluster manifest of Output type.
DryRun bool
// Output type during a DryRun
Output string
}
func (o *CreateClusterOptions) InitDefaults() {
@ -190,6 +196,11 @@ var (
--project my-gce-project \
--image "ubuntu-os-cloud/ubuntu-1604-xenial-v20170202" \
--yes
# Create manifest for a cluster in AWS
kops create cluster --name=kubernetes-cluster.example.com \
--state=s3://kops-state-1234 --zones=eu-west-1a \
--node-count=2 --dry-run -oyaml
`))
create_cluster_short = i18n.T("Create a Kubernetes cluster.")
@ -227,7 +238,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
}
cmd.Flags().BoolVar(&options.Yes, "yes", options.Yes, "Specify --yes to immediately create the cluster")
cmd.Flags().StringVar(&options.Target, "target", options.Target, "Target - direct, terraform, cloudformation")
cmd.Flags().StringVar(&options.Target, "target", options.Target, fmt.Sprintf("Valid targets: %s, %s, %s. Set this flag to %s if you want kops to generate terraform", cloudup.TargetDirect, cloudup.TargetTerraform, cloudup.TargetDirect, cloudup.TargetTerraform))
cmd.Flags().StringVar(&options.Models, "model", options.Models, "Models to apply (separate multiple models with commas)")
// Configuration / state location
@ -297,6 +308,10 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().StringVar(&options.APILoadBalancerType, "api-loadbalancer-type", options.APILoadBalancerType, "Sets the API loadbalancer type to either 'public' or 'internal'")
// DryRun mode that will print YAML or JSON
cmd.Flags().BoolVar(&options.DryRun, "dry-run", options.DryRun, "If true, only print the object that would be sent, without sending it. This flag can be used to create a cluster YAML or JSON manifest.")
cmd.Flags().StringVarP(&options.Output, "output", "o", options.Output, "Ouput format. One of json|yaml. Used with the --dry-run flag.")
if featureflag.SpecOverrideFlag.Enabled() {
cmd.Flags().StringSliceVar(&options.Overrides, "override", options.Overrides, "Directly configure values in the spec")
}
@ -326,6 +341,11 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
isDryrun = true
targetName = cloudup.TargetDryRun
}
if c.DryRun && c.Output == "" {
return fmt.Errorf("unable to execute --dry-run without setting --output")
}
clusterName := c.ClusterName
if clusterName == "" {
return fmt.Errorf("--name is required")
@ -919,8 +939,10 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
}
}
// Use Strict IAM policy and allow AWS ECR by default when creating a new cluster
cluster.Spec.IAM = &api.IAMSpec{
Legacy: false,
AllowContainerRegistry: true,
Legacy: false,
}
sshPublicKeys := make(map[string][]byte)
@ -985,6 +1007,32 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
return err
}
if c.DryRun {
var obj []runtime.Object
obj = append(obj, cluster)
for _, group := range fullInstanceGroups {
// Cluster name is not populated, and we need it
group.ObjectMeta.Labels = make(map[string]string)
group.ObjectMeta.Labels[api.LabelClusterName] = cluster.ObjectMeta.Name
obj = append(obj, group)
}
switch c.Output {
case OutputYaml:
if err := fullOutputYAML(out, obj...); err != nil {
return fmt.Errorf("error writing cluster yaml to stdout: %v", err)
}
return nil
case OutputJSON:
if err := fullOutputJSON(out, obj...); err != nil {
return fmt.Errorf("error writing cluster json to stdout: %v", err)
}
return nil
default:
return fmt.Errorf("unsupported output type %q", c.Output)
}
}
// Note we perform as much validation as we can, before writing a bad config
err = registry.CreateClusterConfig(clientset, cluster, fullInstanceGroups)
if err != nil {
@ -1008,6 +1056,7 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
}
}
// Can we acutally get to this if??
if targetName != "" {
if isDryrun {
fmt.Fprintf(out, "Previewing changes that will be made:\n\n")

37
cmd/kops/create_ig.go
View File

@ -39,6 +39,10 @@ import (
type CreateInstanceGroupOptions struct {
Role string
Subnets []string
// DryRun mode output an ig manifest of Output type.
DryRun bool
// Output type during a DryRun
Output string
}
var (
@ -52,6 +56,10 @@ var (
# Create an instancegroup for the k8s-cluster.example.com cluster.
kops create ig --name=k8s-cluster.example.com node-example \
--role node --subnet my-subnet-name
# Create a YAML manifest for an instancegroup for the k8s-cluster.example.com cluster.
kops create ig --name=k8s-cluster.example.com node-example \
--role node --subnet my-subnet-name --dry-run -oyaml
`))
create_ig_short = i18n.T(`Create an instancegroup.`)
@ -85,6 +93,9 @@ func NewCmdCreateInstanceGroup(f *util.Factory, out io.Writer) *cobra.Command {
cmd.Flags().StringVar(&options.Role, "role", options.Role, "Type of instance group to create ("+strings.Join(allRoles, ",")+")")
cmd.Flags().StringSliceVar(&options.Subnets, "subnet", options.Subnets, "Subnets in which to create instance group")
// DryRun mode that will print YAML or JSON
cmd.Flags().BoolVar(&options.DryRun, "dry-run", options.DryRun, "If true, only print the object that would be sent, without sending it. This flag can be used to create a cluster YAML or JSON manifest.")
cmd.Flags().StringVarP(&options.Output, "output", "o", options.Output, "Ouput format. One of json|yaml")
return cmd
}
@ -142,6 +153,32 @@ func RunCreateInstanceGroup(f *util.Factory, cmd *cobra.Command, args []string,
return err
}
if options.DryRun {
if options.Output == "" {
return fmt.Errorf("must set output flag; yaml or json")
}
// Cluster name is not populated, and we need it
ig.ObjectMeta.Labels = make(map[string]string)
ig.ObjectMeta.Labels[api.LabelClusterName] = cluster.ObjectMeta.Name
switch options.Output {
case OutputYaml:
if err := fullOutputYAML(out, ig); err != nil {
return fmt.Errorf("error writing cluster yaml to stdout: %v", err)
}
return nil
case OutputJSON:
if err := fullOutputJSON(out, ig); err != nil {
return fmt.Errorf("error writing cluster json to stdout: %v", err)
}
return nil
default:
return fmt.Errorf("unsupported output type %q", options.Output)
}
}
var (
edit = editor.NewDefaultEditor(editorEnvs)
)

1
cmd/kops/delete.go
View File

@ -21,6 +21,7 @@ import (
"io"
"bytes"
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime/schema"

41
cmd/kops/get.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package main
import (
"encoding/json"
"fmt"
"io"
@ -153,35 +152,27 @@ func RunGet(context Factory, out io.Writer, options *GetOptions) error {
return err
}
var obj []runtime.Object
if options.output != OutputTable {
obj = append(obj, cluster)
for _, group := range instancegroups {
obj = append(obj, group)
}
}
switch options.output {
case OutputYaml:
err = clusterOutputYAML(clusters, out)
if err != nil {
return err
if err := fullOutputYAML(out, obj...); err != nil {
return fmt.Errorf("error writing cluster yaml to stdout: %v", err)
}
if err := writeYAMLSep(out); err != nil {
return err
}
err = igOutputYAML(instancegroups, out)
if err != nil {
return err
}
return nil
case OutputJSON:
return fmt.Errorf("not implemented")
// TODO this is not outputing valid json. Not sure what cluster and instance groups should look like
/*
err = clusterOutputJson(clusters,out)
if err != nil {
return err
}
err = igOutputJson(instancegroups,out)
if err != nil {
return err
}*/
if err := fullOutputJSON(out, obj...); err != nil {
return fmt.Errorf("error writing cluster json to stdout: %v", err)
}
return nil
case OutputTable:
fmt.Fprintf(os.Stdout, "Cluster\n")
@ -235,7 +226,7 @@ func marshalYaml(obj runtime.Object) ([]byte, error) {
// obj must be a pointer to a marshalable object
func marshalJSON(obj runtime.Object) ([]byte, error) {
j, err := json.MarshalIndent(obj, "", " ")
j, err := kopscodecs.ToVersionedJSON(obj)
if err != nil {
return nil, fmt.Errorf("error marshaling json: %v", err)
}

54
cmd/kops/get_cluster.go
View File

@ -18,13 +18,13 @@ package main
import (
"fmt"
"io"
"os"
"strings"
"io"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
@ -133,7 +133,7 @@ func RunGetClusters(context Factory, out io.Writer, options *GetClusterOptions)
}
if len(clusters) == 0 {
return fmt.Errorf("No clusters found")
return fmt.Errorf("no clusters found")
}
if options.FullSpec {
@ -146,14 +146,20 @@ func RunGetClusters(context Factory, out io.Writer, options *GetClusterOptions)
fmt.Fprint(out, get_cluster_full_warning)
}
var obj []runtime.Object
if options.output != OutputTable {
for _, c := range clusters {
obj = append(obj, c)
}
}
switch options.output {
case OutputTable:
return clusterOutputTable(clusters, out)
case OutputYaml:
return clusterOutputYAML(clusters, out)
return fullOutputYAML(out, obj...)
case OutputJSON:
return clusterOutputJson(clusters, out)
return fullOutputJSON(out, obj...)
default:
return fmt.Errorf("Unknown output format: %q", options.output)
}
@ -206,23 +212,47 @@ func clusterOutputTable(clusters []*api.Cluster, out io.Writer) error {
return t.Render(clusters, out, "NAME", "CLOUD", "ZONES")
}
func clusterOutputJson(clusters []*api.Cluster, out io.Writer) error {
for _, cluster := range clusters {
if err := marshalToWriter(cluster, marshalJSON, out); err != nil {
// fullOutputJson outputs the marshalled JSON of a list of clusters and instance groups. It will handle
// nils for clusters and instanceGroups slices.
func fullOutputJSON(out io.Writer, args ...runtime.Object) error {
argsLen := len(args)
if argsLen > 1 {
if _, err := fmt.Fprint(out, "["); err != nil {
return err
}
}
for i, arg := range args {
if i != 0 {
if _, err := fmt.Fprint(out, ","); err != nil {
return err
}
}
if err := marshalToWriter(arg, marshalJSON, out); err != nil {
return err
}
}
if argsLen > 1 {
if _, err := fmt.Fprint(out, "]"); err != nil {
return err
}
}
return nil
}
func clusterOutputYAML(clusters []*api.Cluster, out io.Writer) error {
for i, cluster := range clusters {
// fullOutputJson outputs the marshalled JSON of a list of clusters and instance groups. It will handle
// nils for clusters and instanceGroups slices.
func fullOutputYAML(out io.Writer, args ...runtime.Object) error {
for i, obj := range args {
if i != 0 {
if err := writeYAMLSep(out); err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(cluster, marshalYaml, out); err != nil {
if err := marshalToWriter(obj, marshalYaml, out); err != nil {
return err
}
}

30
cmd/kops/get_federation.go
View File

@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/util/pkg/tables"
@ -85,10 +86,16 @@ func RunGetFederations(context Factory, out io.Writer, options *GetFederationOpt
if len(federations) == 0 {
return fmt.Errorf("No federations found")
}
var obj []runtime.Object
if options.output != OutputTable {
for _, c := range federations {
obj = append(obj, c)
}
}
switch options.output {
case OutputTable:
t := &tables.Table{}
t.AddColumn("NAME", func(f *api.Federation) string {
return f.ObjectMeta.Name
@ -102,25 +109,10 @@ func RunGetFederations(context Factory, out io.Writer, options *GetFederationOpt
return t.Render(federations, out, "NAME", "CONTROLLERS", "MEMBERS")
case OutputYaml:
for i, f := range federations {
if i != 0 {
_, err = out.Write([]byte("\n\n---\n\n"))
if err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(f, marshalYaml, os.Stdout); err != nil {
return err
}
}
return fullOutputYAML(out, obj...)
case OutputJSON:
for _, f := range federations {
if err := marshalToWriter(f, marshalJSON, os.Stdout); err != nil {
return err
}
}
return fullOutputJSON(out, obj...)
default:
return fmt.Errorf("Unknown output format: %q", options.output)
}
return nil
}

36
cmd/kops/get_instancegroups.go
View File

@ -24,6 +24,7 @@ import (
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/formatter"
@ -112,14 +113,20 @@ func RunGetInstanceGroups(options *GetInstanceGroupsOptions, args []string) erro
return fmt.Errorf("No InstanceGroup objects found")
}
switch options.output {
var obj []runtime.Object
if options.output != OutputTable {
for _, c := range instancegroups {
obj = append(obj, c)
}
}
switch options.output {
case OutputTable:
return igOutputTable(cluster, instancegroups, out)
case OutputYaml:
return igOutputYAML(instancegroups, out)
return fullOutputYAML(out, obj...)
case OutputJSON:
return igOutputJson(instancegroups, out)
return fullOutputJSON(out, obj...)
default:
return fmt.Errorf("Unknown output format: %q", options.output)
}
@ -176,29 +183,6 @@ func igOutputTable(cluster *api.Cluster, instancegroups []*api.InstanceGroup, ou
return t.Render(instancegroups, os.Stdout, "NAME", "ROLE", "MACHINETYPE", "MIN", "MAX", "ZONES")
}
func igOutputJson(instanceGroups []*api.InstanceGroup, out io.Writer) error {
for _, ig := range instanceGroups {
if err := marshalToWriter(ig, marshalJSON, out); err != nil {
return err
}
}
return nil
}
func igOutputYAML(instanceGroups []*api.InstanceGroup, out io.Writer) error {
for i, ig := range instanceGroups {
if i != 0 {
if err := writeYAMLSep(out); err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(ig, marshalYaml, out); err != nil {
return err
}
}
return nil
}
func int32PointerToString(v *int32) string {
if v == nil {
return "-"

1
cmd/kops/status_discovery.go
View File

@ -18,6 +18,7 @@ package main
import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi/cloudup"

49
cmd/kops/toolbox_template.go
View File

@ -17,12 +17,13 @@ limitations under the License.
package main
import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"path"
"path/filepath"
"strings"
"github.com/ghodss/yaml"
"github.com/spf13/cobra"
@ -139,16 +140,14 @@ func runToolBoxTemplate(f *util.Factory, out io.Writer, options *toolboxTemplate
if err != nil {
return fmt.Errorf("unable to read snippet: %s, error: %s", j, err)
}
snippets[j] = string(content)
snippets[path.Base(j)] = string(content)
}
}
b := new(bytes.Buffer)
// @step: render each of the template and write to location
// @step: render each of the templates, splitting on the documents
r := templater.NewTemplater()
size := len(templates) - 1
for i, x := range templates {
var documents []string
for _, x := range templates {
content, err := ioutil.ReadFile(x)
if err != nil {
return fmt.Errorf("unable to read template: %s, error: %s", x, err)
@ -158,37 +157,35 @@ func runToolBoxTemplate(f *util.Factory, out io.Writer, options *toolboxTemplate
if err != nil {
return fmt.Errorf("unable to render template: %s, error: %s", x, err)
}
// @check if we have a zero length string and if so, forgo it
// @check if the content is zero ignore it
if len(rendered) <= 0 {
continue
}
// @check if we need to format the yaml
if options.formatYAML {
var data interface{}
if err := utils.YamlUnmarshal([]byte(rendered), &data); err != nil {
if !options.formatYAML {
documents = append(documents, strings.Split(rendered, "---\n")...)
continue
}
for _, x := range strings.Split(rendered, "---\n") {
var data map[string]interface{}
if err := yaml.Unmarshal([]byte(x), &data); err != nil {
return fmt.Errorf("unable to unmarshall content from template: %s, error: %s", x, err)
}
// @TODO: i'm not sure how this could happen but best to heck none the less
if len(data) <= 0 {
continue
}
formatted, err := yaml.Marshal(&data)
if err != nil {
return fmt.Errorf("unable to marhshal formated content to yaml: %s", err)
}
rendered = string(formatted)
}
if _, err := b.WriteString(rendered); err != nil {
return fmt.Errorf("unable to write template: %s, error: %s", x, err)
}
// @check if we should need to add document separator
if i < size {
if _, err := b.WriteString("---\n"); err != nil {
return fmt.Errorf("unable to write to template: %s, error: %s", x, err)
}
documents = append(documents, string(formatted))
}
}
iowriter := out
// join in harmony all the YAML documents back together
content := strings.Join(documents, "---\n")
iowriter := out
// @check if we are writing to a file rather than stdout
if options.outputPath != "" {
w, err := os.OpenFile(utils.ExpandPath(options.outputPath), os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0660)
@ -199,7 +196,7 @@ func runToolBoxTemplate(f *util.Factory, out io.Writer, options *toolboxTemplate
iowriter = w
}
if _, err := iowriter.Write(b.Bytes()); err != nil {
if _, err := iowriter.Write([]byte(content)); err != nil {
return fmt.Errorf("unable to write template: %s", err)
}

3
dns-controller/pkg/dns/zonespec.go
View File

@ -18,9 +18,10 @@ package dns
import (
"fmt"
"strings"
"github.com/golang/glog"
"k8s.io/kubernetes/federation/pkg/dnsprovider"
"strings"
)
type ZoneSpec struct {

8
docs/cli/kops_create_cluster.md
View File

@ -56,6 +56,10 @@ kops create cluster
--project my-gce-project \
--image "ubuntu-os-cloud/ubuntu-1604-xenial-v20170202" \
--yes
# Create manifest for a cluster in AWS
kops create cluster --name=kubernetes-cluster.example.com \
--state=s3://kops-state-1234 --zones=eu-west-1a \
--node-count=2 --dry-run -oyaml
```
### Options
@ -71,6 +75,7 @@ kops create cluster
--cloud-labels string A list of KV pairs used to tag all instance groups in AWS (eg "Owner=John Doe,Team=Some Team").
--dns string DNS hosted zone to use: public|private. Default is 'public'. (default "Public")
--dns-zone string DNS hosted zone to use (defaults to longest matching zone)
--dry-run If true, only print the object that would be sent, without sending it. This flag can be used to create a cluster YAML or JSON manifest.
--encrypt-etcd-storage Generate key in aws kms and use it for encrypt etcd volumes
--image string Image to use for all instances.
--kubernetes-version string Version of kubernetes to run (defaults to version in channel)
@ -89,10 +94,11 @@ kops create cluster
--node-tenancy string The tenancy of the node group on AWS. Can be either default or dedicated.
--node-volume-size int32 Set instance volume size (in GB) for nodes
--out string Path to write any local output
-o, --output string Ouput format. One of json|yaml. Used with the --dry-run flag.
--project string Project to use (must be set on GCE)
--ssh-access stringSlice Restrict SSH access to this CIDR. If not set, access will not be restricted by IP. (default [0.0.0.0/0])
--ssh-public-key string SSH public key to use (default "~/.ssh/id_rsa.pub")
--target string Target - direct, terraform, cloudformation (default "direct")
--target string Valid targets: direct, terraform, direct. Set this flag to terraform if you want kops to generate terraform (default "direct")
-t, --topology string Controls network topology for the cluster. public|private. Default is 'public'. (default "public")
--vpc string Set to use a shared VPC
--yes Specify --yes to immediately create the cluster

6
docs/cli/kops_create_instancegroup.md
View File

@ -20,11 +20,17 @@ kops create instancegroup
# Create an instancegroup for the k8s-cluster.example.com cluster.
kops create ig --name=k8s-cluster.example.com node-example \
--role node --subnet my-subnet-name
# Create a YAML manifest for an instancegroup for the k8s-cluster.example.com cluster.
kops create ig --name=k8s-cluster.example.com node-example \
--role node --subnet my-subnet-name --dry-run -oyaml
```
### Options
```
--dry-run If true, only print the object that would be sent, without sending it. This flag can be used to create a cluster YAML or JSON manifest.
-o, --output string Ouput format. One of json|yaml
--role string Type of instance group to create (Node,Master,Bastion) (default "Node")
--subnet stringSlice Subnets in which to create instance group
```

3
docs/cluster_spec.md
View File

@ -140,8 +140,11 @@ spec:
auditLogMaxAge: 10
auditLogMaxBackups: 1
auditLogMaxSize: 100
auditPolicyFile: /srv/kubernetes/audit.conf
```
Note: you could use the fileAssets feature to push an advanced audit policy file on the master nodes.
#### runtimeConfig
Keys and values here are translated into `--runtime-config` values for `kube-apiserver`, separated by commas.

2
docs/cluster_upgrades_and_migrations.md
View File

@ -204,7 +204,7 @@ Limitations:
4. Verify the planned changes with `kops update cluster cluster.example.com`
5. Create the cluster with `kops update cluster cluster.example.com --yes`
6. Wait around for the cluster to fully come up and be available. `k get nodes` should return `(master + minions) = 15` available nodes.
7. (Optional) Create the Dashboard with `kubectl create -f https://rawgit.com/kubernetes/dashboard/master/src/deploy/kubernetes-dashboard.yaml`
7. (Optional) Create the Dashboard with `kubectl create -f https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/recommended/kubernetes-dashboard.yaml`
8. Deploy the existing resource configuration to the new cluster.
9. Confirm that pods on the new cluster are able to access remote resources.
- For AWS-hosted services, add the generated `nodes.cluster.example.com` security group to the resources that may need it (i.e. ElastiCache, RDS, etc).

2
docs/development/api_updates.md
View File

@ -3,7 +3,7 @@
Kops uses the Kubernetes API machinery. It is well designed, and very powerful, but you have to
jump through some hoops to use it.
Recommended reading: [kubernetes API changes doc](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/api_changes.md)
Recommended reading: [kubernetes API changes doc](https://github.com/kubernetes/community/blob/master/contributors/devel/api_changes.md)
The kops APIs live in [pkg/apis/kops](https://github.com/kubernetes/kops/tree/master/pkg/apis/kops), both in
that directory directly (the unversioned API) and in the versioned subdirectories (`v1alpha1`, `v1alpha2`).

3
examples/kops-api-example/main.go
View File

@ -19,9 +19,10 @@ package main
import (
"flag"
"fmt"
"k8s.io/kops/util/pkg/vfs"
"os"
"strings"
"k8s.io/kops/util/pkg/vfs"
)
// registryBase is the base path where state files are kept (the state store)

1
examples/kops-api-example/up.go
View File

@ -19,6 +19,7 @@ package main
import (
"fmt"
"io/ioutil"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/client/simple/vfsclientset"
"k8s.io/kops/upup/pkg/fi"

1
federation/federation_cluster.go
View File

@ -18,6 +18,7 @@ package federation
import (
"fmt"
"github.com/golang/glog"
"k8s.io/api/core/v1"
k8sapiv1 "k8s.io/api/core/v1"

1
federation/federation_configuration.go
View File

@ -18,6 +18,7 @@ package federation
import (
"fmt"
"github.com/golang/glog"
"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

1
federation/federation_namespace.go
View File

@ -18,6 +18,7 @@ package federation
import (
"fmt"
"github.com/golang/glog"
"k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"

1
federation/targets/kubernetestarget/kubernetestarget.go
View File

@ -18,6 +18,7 @@ package kubernetestarget
import (
"fmt"
"k8s.io/client-go/kubernetes"
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/client/simple"

1
federation/tasks/kubernetesresource.go
View File

@ -18,6 +18,7 @@ package tasks
import (
"fmt"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kops/federation/targets/kubernetestarget"
"k8s.io/kops/upup/pkg/fi"

3
nodeup/pkg/distros/identify.go
View File

@ -18,11 +18,12 @@ package distros
import (
"fmt"
"github.com/golang/glog"
"io/ioutil"
"os"
"path"
"strings"
"github.com/golang/glog"
)
// FindDistribution identifies the distribution on which we are running

5
nodeup/pkg/model/docker_test.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package model
import (
"path"
"testing"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/flagbuilder"
"k8s.io/kops/upup/pkg/fi"
"path"
"testing"
)
func TestDockerBuilder_Simple(t *testing.T) {

2
nodeup/pkg/model/kubectl.go
View File

@ -33,7 +33,7 @@ type KubectlBuilder struct {
var _ fi.ModelBuilder = &KubectlBuilder{}
// Build is responsible for mananging the kubectl on the nodes
// Build is responsible for managing the kubectl on the nodes
func (b *KubectlBuilder) Build(c *fi.ModelBuilderContext) error {
if !b.IsMaster {
return nil

1
nodeup/pkg/model/kubelet_test.go
View File

@ -25,6 +25,7 @@ import (
"testing"
"fmt"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kops/nodeup/pkg/distros"
"k8s.io/kops/pkg/apis/kops"

3
nodeup/pkg/model/network.go
View File

@ -18,9 +18,10 @@ package model
import (
"fmt"
"path/filepath"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
"path/filepath"
)
// NetworkBuilder writes CNI assets

3
pkg/apis/kops/channel.go
View File

@ -18,13 +18,14 @@ package kops
import (
"fmt"
"net/url"
"github.com/blang/semver"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops/util"
"k8s.io/kops/util/pkg/vfs"
"net/url"
)
var DefaultChannelBase = "https://raw.githubusercontent.com/kubernetes/kops/master/channels/"

1
pkg/apis/kops/model/utils.go
View File

@ -18,6 +18,7 @@ package model
import (
"fmt"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kops/pkg/apis/kops"
)

3
pkg/apis/kops/model/utils_test.go
View File

@ -17,9 +17,10 @@ limitations under the License.
package model
import (
"k8s.io/kops/pkg/apis/kops"
"reflect"
"testing"
"k8s.io/kops/pkg/apis/kops"
)
// Test_FindSubnet tests FindSubnet

1
pkg/apis/kops/registry/helpers.go
View File

@ -18,6 +18,7 @@ package registry
import (
"fmt"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/client/simple"
)

1
pkg/apis/kops/registry/registry.go
View File

@ -18,6 +18,7 @@ package registry
import (
"fmt"
"k8s.io/apimachinery/pkg/util/validation/field"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/util/pkg/vfs"

3
pkg/apis/kops/semver_test.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package kops
import (
"github.com/blang/semver"
"testing"
"github.com/blang/semver"
)
// Test_SemverOrdering is a test of semver ordering, but highlights the case that trips everyone one:

3
pkg/apis/kops/util/labels.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package util
import (
"k8s.io/api/core/v1"
"strings"
"k8s.io/api/core/v1"
)
func GetNodeRole(node *v1.Node) string {

5
pkg/apis/kops/v1alpha1/conversion.go
View File

@ -18,11 +18,12 @@ package v1alpha1
import (
"fmt"
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/kops/pkg/apis/kops"
"reflect"
"sort"
"strings"
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/kops/pkg/apis/kops"
)
func Convert_v1alpha1_BastionSpec_To_kops_BastionSpec(in *BastionSpec, out *kops.BastionSpec, s conversion.Scope) error {

3
pkg/apis/kops/validation/helpers.go
View File

@ -17,9 +17,10 @@ limitations under the License.
package validation
import (
"k8s.io/apimachinery/pkg/util/validation/field"
"net"
"net/url"
"k8s.io/apimachinery/pkg/util/validation/field"
)
// isSubnet checks if child is a subnet of parent

1
pkg/apis/kops/validation/instancegroup.go
View File

@ -18,6 +18,7 @@ package validation
import (
"fmt"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/util"

5
pkg/apis/kops/validation/instancegroup_test.go
View File

@ -17,10 +17,11 @@ limitations under the License.
package validation
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops"
"strings"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kops/pkg/apis/kops"
)
func TestDefaultTaintsEnforcedBefore160(t *testing.T) {

1
pkg/apiserver/apiserver.go
View File

@ -18,6 +18,7 @@ package apiserver
import (
"fmt"
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

3
pkg/assets/builder_test.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package assets
import (
"k8s.io/kops/pkg/apis/kops"
"testing"
"k8s.io/kops/pkg/apis/kops"
)
func TestRemap_File(t *testing.T) {

7
pkg/client/simple/vfsclientset/cluster.go
View File

@ -18,6 +18,10 @@ package vfsclientset
import (
"fmt"
"os"
"strings"
"time"
"github.com/golang/glog"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@ -28,9 +32,6 @@ import (
"k8s.io/kops/pkg/apis/kops/v1alpha1"
"k8s.io/kops/pkg/apis/kops/validation"
"k8s.io/kops/util/pkg/vfs"
"os"
"strings"
"time"
)
type ClusterVFS struct {

9
pkg/client/simple/vfsclientset/commonvfs.go
View File

@ -19,6 +19,11 @@ package vfsclientset
import (
"bytes"
"fmt"
"os"
"reflect"
"sort"
"time"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1"
@ -30,10 +35,6 @@ import (
"k8s.io/kops/pkg/apis/kops/v1alpha2"
"k8s.io/kops/pkg/kopscodecs"
"k8s.io/kops/util/pkg/vfs"
"os"
"reflect"
"sort"
"time"
)
var StoreVersion = v1alpha2.SchemeGroupVersion

1
pkg/client/simple/vfsclientset/federation.go
View File

@ -18,6 +18,7 @@ package vfsclientset
import (
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"

1
pkg/client/simple/vfsclientset/import_known_versions.go
View File

@ -19,6 +19,7 @@ package vfsclientset
// These imports are the API groups the client will support.
import (
"fmt"
"k8s.io/kops/pkg/kopscodecs"
)

1
pkg/client/simple/vfsclientset/instancegroup.go
View File

@ -18,6 +18,7 @@ package vfsclientset
import (
"fmt"
"github.com/golang/glog"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

3
pkg/client/simple/vfsclientset/utils.go
View File

@ -18,8 +18,9 @@ package vfsclientset
import (
"fmt"
"k8s.io/kops/util/pkg/vfs"
"os"
"k8s.io/kops/util/pkg/vfs"
)
func listChildNames(vfsPath vfs.Path) ([]string, error) {

3
pkg/diff/diff_test.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package diff
import (
"github.com/sergi/go-diff/diffmatchpatch"
"testing"
"github.com/sergi/go-diff/diffmatchpatch"
)
func Test_Diff_1(t *testing.T) {

1
pkg/edit/edit.go
View File

@ -18,6 +18,7 @@ package edit
import (
"bytes"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kops/pkg/diff"
"k8s.io/kops/pkg/kopscodecs"

3
pkg/featureflag/featureflag_test.go
View File

@ -17,9 +17,10 @@ limitations under the License.
package featureflag
import (
"github.com/golang/glog"
"os"
"testing"
"github.com/golang/glog"
)
func TestFlagToFalse(t *testing.T) {

2
pkg/flagbuilder/build_flags.go
View File

@ -29,7 +29,7 @@ import (
"github.com/golang/glog"
)
// BuildFlags returns a space seperated list arguments
// BuildFlags returns a space separated list arguments
// @deprecated: please use BuildFlagsList
func BuildFlags(options interface{}) (string, error) {
flags, err := BuildFlagsList(options)

5
pkg/formatter/instancegroup.go
View File

@ -17,10 +17,11 @@ limitations under the License.
package formatter
import (
"strings"
"github.com/golang/glog"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/model"
"strings"
)
// InstanceGroupRenderFunction is a render function for an InstanceGroup
@ -38,7 +39,7 @@ func RenderInstanceGroupZones(cluster *kops.Cluster) InstanceGroupRenderFunction
return func(ig *kops.InstanceGroup) string {
zones, err := model.FindZonesForInstanceGroup(cluster, ig)
if err != nil {
glog.Warningf("error fetch zones for instancegroup: %v", err)
glog.Warningf("error fetching zones for instancegroup: %v", err)
return ""
}
return strings.Join(zones, ",")

3
pkg/formatter/instancegroup_test.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package formatter
import (
"k8s.io/kops/pkg/apis/kops"
"testing"
"k8s.io/kops/pkg/apis/kops"
)
func TestRenderInstanceGroupZones(t *testing.T) {

3
pkg/k8scodecs/codecs.go
View File

@ -19,6 +19,8 @@ package k8scodecs
import (
"bytes"
"fmt"
"os"
"github.com/golang/glog"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apimachinery/announced"
@ -27,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
"os"
)
var Scheme = runtime.NewScheme()

7
pkg/k8scodecs/codecs_test.go
View File

@ -17,14 +17,15 @@ limitations under the License.
package k8scodecs
import (
"strings"
"testing"
"time"
"github.com/MakeNowJust/heredoc"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kops/pkg/diff"
"strings"
"testing"
"time"
)
// An arbitrary timestamp for testing

28
pkg/kopscodecs/codecs.go
View File

@ -19,6 +19,8 @@ package kopscodecs
import (
"bytes"
"fmt"
"os"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
@ -29,7 +31,6 @@ import (
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/install"
"k8s.io/kops/pkg/apis/kops/v1alpha2"
"os"
)
var Scheme = runtime.NewScheme()
@ -44,12 +45,12 @@ func init() {
install.Install(GroupFactoryRegistry, Registry, Scheme)
}
func encoder(gv runtime.GroupVersioner) runtime.Encoder {
yaml, ok := runtime.SerializerInfoForMediaType(Codecs.SupportedMediaTypes(), "application/yaml")
func encoder(gv runtime.GroupVersioner, mediaType string) runtime.Encoder {
e, ok := runtime.SerializerInfoForMediaType(Codecs.SupportedMediaTypes(), mediaType)
if !ok {
glog.Fatalf("no YAML serializer registered")
glog.Fatalf("no %s serializer registered", mediaType)
}
return Codecs.EncoderForVersion(yaml.Serializer, gv)
return Codecs.EncoderForVersion(e.Serializer, gv)
}
func decoder() runtime.Decoder {
@ -67,7 +68,22 @@ func ToVersionedYaml(obj runtime.Object) ([]byte, error) {
// ToVersionedYamlWithVersion encodes the object to YAML, in a specified API version
func ToVersionedYamlWithVersion(obj runtime.Object, version runtime.GroupVersioner) ([]byte, error) {
var w bytes.Buffer
err := encoder(version).Encode(obj, &w)
err := encoder(version, "application/yaml").Encode(obj, &w)
if err != nil {
return nil, fmt.Errorf("error encoding %T: %v", obj, err)
}
return w.Bytes(), nil
}
// ToVersionedJSON encodes the object to JSON
func ToVersionedJSON(obj runtime.Object) ([]byte, error) {
return ToVersionedJSONWithVersion(obj, v1alpha2.SchemeGroupVersion)
}
// ToVersionedJSONWithVersion encodes the object to JSON, in a specified API version
func ToVersionedJSONWithVersion(obj runtime.Object, version runtime.GroupVersioner) ([]byte, error) {
var w bytes.Buffer
err := encoder(version, "application/json").Encode(obj, &w)
if err != nil {
return nil, fmt.Errorf("error encoding %T: %v", obj, err)
}

7
pkg/kopscodecs/codecs_test.go
View File

@ -17,14 +17,15 @@ limitations under the License.
package kopscodecs
import (
"strings"
"testing"
"time"
"github.com/MakeNowJust/heredoc"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kops/pkg/apis/kops/v1alpha2"
"k8s.io/kops/pkg/diff"
"strings"
"testing"
"time"
)
// An arbitrary timestamp for testing

3
pkg/kubeconfig/create_kubecfg.go
View File

@ -18,11 +18,12 @@ package kubeconfig
import (
"fmt"
"sort"
"github.com/golang/glog"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/dns"
"k8s.io/kops/upup/pkg/fi"
"sort"
)
func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore) (*KubeconfigBuilder, error) {

3
pkg/kubemanifest/images.go
View File

@ -18,8 +18,9 @@ package kubemanifest
import (
"fmt"
"github.com/golang/glog"
"strings"
"github.com/golang/glog"
)
type ImageRemapFunction func(image string) (string, error)

1
pkg/kubemanifest/manifest.go
View File

@ -19,6 +19,7 @@ package kubemanifest
import (
"bytes"
"fmt"
"github.com/ghodss/yaml"
"github.com/golang/glog"
)

3
pkg/kubemanifest/visitor.go
View File

@ -18,8 +18,9 @@ package kubemanifest
import (
"fmt"
"github.com/golang/glog"
"strings"
"github.com/golang/glog"
)
type visitorBase struct {

3
pkg/model/awsmodel/autoscalinggroup_test.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package awsmodel
import (
"testing"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/model"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
"testing"
)
func buildMinimalCluster() *kops.Cluster {

5
pkg/model/components/kubecontrollermanager_test.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package components
import (
"testing"
"time"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/assets"
"testing"
"time"
)
type ClusterParams struct {

1
pkg/model/components/networking.go
View File

@ -18,6 +18,7 @@ package components
import (
"fmt"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/loader"

Some files were not shown because too many files have changed in this diff Show More