author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
596,240 | 22.09.2017 20:54:31 | -7,200 | df47082c5eb80c54d046f85a45296fc24e3fbd8d | requeue them klusters again. shouldn't matter | [
{
"change_type": "MODIFY",
"old_path": "pkg/controller/launch.go",
"new_path": "pkg/controller/launch.go",
"diff": "@@ -203,6 +203,7 @@ func (launchctl *LaunchControl) createNode(kluster *v1.Kluster, pool *v1.NodePoo\nreturn err\n}\n+ launchctl.requeue(kluster)\nreturn nil\n}\n@@ -217,6 +218,7 @@ func (launchctl *LaunchControl) terminateNode(kluster *v1.Kluster, pool *v1.Node\nreturn err\n}\n+ launchctl.requeue(kluster)\nreturn nil\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | requeue them klusters again. shouldn't matter |
596,240 | 22.09.2017 21:29:14 | -7,200 | 148e95e1929166adc573c3718297c1ce5a89c589 | set size on non-copy nodepoolspec | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/update_cluster.go",
"new_path": "pkg/api/handlers/update_cluster.go",
"diff": "@@ -25,9 +25,9 @@ func (d *updateCluster) Handle(params operations.UpdateClusterParams, principal\nfor _, pPool := range params.Body.Spec.NodePools {\nisNewPool := true\n- for _, kPool := range kluster.Spec.NodePools {\n+ for i, kPool := range kluster.Spec.NodePools {\nif *pPool.Name == kPool.Name {\n- kPool.Size = int(*pPool.Size)\n+ kluster.Spec.NodePools[i].Size = int(*pPool.Size)\nisNewPool = false\n}\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | set size on non-copy nodepoolspec |
596,240 | 22.09.2017 23:22:57 | -7,200 | eaecd77e7a4683a09c911bea315cc585c5bc96cd | fix update pointer foo as well | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/update_cluster.go",
"new_path": "pkg/api/handlers/update_cluster.go",
"diff": "@@ -22,7 +22,7 @@ func (d *updateCluster) Handle(params operations.UpdateClusterParams, principal\nkluster, err := editCluster(d.Kubernikus.Kubernikus().Klusters(d.Namespace), principal, params.Name, func(kluster *v1.Kluster) {\n// Update Sizes\n- for _, pPool := range params.Body.Spec.NodePools {\n+ for j, pPool := range params.Body.Spec.NodePools {\nisNewPool := true\nfor i, kPool := range kluster.Spec.NodePools {\n@@ -34,10 +34,10 @@ func (d *updateCluster) Handle(params operations.UpdateClusterParams, principal\nif isNewPool {\nkluster.Spec.NodePools = append(kluster.Spec.NodePools, v1.NodePool{\n- Name: *pPool.Name,\n- Size: int(*pPool.Size),\n- Flavor: *pPool.Flavor,\n- Image: pPool.Image,\n+ Name: *params.Body.Spec.NodePools[j].Name,\n+ Size: int(*params.Body.Spec.NodePools[j].Size),\n+ Flavor: *params.Body.Spec.NodePools[j].Flavor,\n+ Image: \"coreos-stable-amd64\",\n})\n}\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fix update pointer foo as well |
596,240 | 23.09.2017 00:27:51 | -7,200 | e1f8e8888edf8b4f96a64e0298d9b93a95524e84 | generate empty nodepool info | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/update_cluster.go",
"new_path": "pkg/api/handlers/update_cluster.go",
"diff": "@@ -39,6 +39,14 @@ func (d *updateCluster) Handle(params operations.UpdateClusterParams, principal\nFlavor: *params.Body.Spec.NodePools[j].Flavor,\nImage: \"coreos-stable-amd64\",\n})\n+\n+ kluster.Status.NodePools = append(kluster.Status.NodePools, v1.NodePoolInfo{\n+ Name: *params.Body.Spec.NodePools[j].Name,\n+ Size: int(*params.Body.Spec.NodePools[j].Size),\n+ Running: 0,\n+ Healthy: 0,\n+ Schedulable: 0,\n+ })\n}\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | generate empty nodepool info |
596,240 | 26.09.2017 16:24:37 | -7,200 | e9ebc9840723bbd29ddaddf08fa41a5e6588a805 | delete openstack wormhole :/ | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -51,9 +51,6 @@ type Client interface {\nGetRegion() (string, error)\nGetRouters(project_id string) ([]Router, error)\nDeleteUser(username, domainID string) error\n-\n- CreateWormhole(*kubernikus_v1.Kluster, string, string) (string, error)\n- GetWormhole(*kubernikus_v1.Kluster) (*Node, error)\n}\ntype Project struct {\n@@ -429,38 +426,6 @@ func (c *client) GetNodes(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.No\nreturn nodes, nil\n}\n-func (c *client) GetWormhole(kluster *kubernikus_v1.Kluster) (*Node, error) {\n- provider, err := c.klusterClientFor(kluster)\n- if err != nil {\n- return nil, err\n- }\n-\n- client, err := openstack.NewComputeV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return nil, err\n- }\n-\n- prefix := fmt.Sprintf(\"wormhole-%v\", kluster.Name)\n- opts := servers.ListOpts{Name: prefix}\n-\n- var node *Node\n- servers.List(client, opts).EachPage(func(page pagination.Page) (bool, error) {\n- serverList, err := ExtractServers(page)\n- if err != nil {\n- glog.V(5).Infof(\"Couldn't extract server %v\", err)\n- return false, err\n- }\n-\n- if len(serverList) > 0 {\n- node = &serverList[0]\n- }\n-\n- return true, nil\n- })\n-\n- return node, nil\n-}\n-\nfunc (c *client) CreateNode(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.NodePool, userData []byte) (string, error) {\nprovider, err := c.klusterClientFor(kluster)\nif err != nil {\n@@ -492,54 +457,6 @@ func (c *client) CreateNode(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.\nreturn server.ID, nil\n}\n-func (c *client) CreateWormhole(kluster *kubernikus_v1.Kluster, projectID, networkID string) (string, error) {\n- provider, err := c.controlPlaneClient()\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't get provider for %v: %v\", projectID, err)\n- }\n-\n- client, err := openstack.NewComputeV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't get Compute client: %v\", err)\n- }\n-\n- name := fmt.Sprintf(\"wormhole-%v\", kluster.Name)\n- glog.V(5).Infof(\"Creating %v\", name)\n-\n- localPort, err := c.FindOrCreateWormholeLocalPort(kluster, projectID, networkID)\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't find/create local wormhole: %v\", err)\n- }\n-\n- foreignPort, err := c.FindOrCreateWormholeForeignPort(kluster, networkID)\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't find/create local wormhol: %v\", err)\n- }\n-\n- glog.Infof(\"%#v\", servers.CreateOpts{\n- Name: name,\n- FlavorName: \"m1.small\",\n- ImageName: \"ubuntu-16.04-amd64-vmware\",\n- Networks: []servers.Network{servers.Network{Port: foreignPort}, servers.Network{Port: localPort}},\n- ServiceClient: client,\n- })\n-\n- server, err := servers.Create(client, servers.CreateOpts{\n- Name: name,\n- FlavorName: \"m1.small\",\n- ImageName: \"ubuntu-16.04-amd64-vmware\",\n- Networks: []servers.Network{servers.Network{Port: foreignPort}, servers.Network{Port: localPort}},\n- ServiceClient: client,\n- }).Extract()\n-\n- if err != nil {\n- glog.V(5).Infof(\"Couldn't create %v: %v\", name, err)\n- return \"\", fmt.Errorf(\"Couldn't create wormhole: %v\", err)\n- }\n-\n- return server.ID, nil\n-}\n-\nfunc (c *client) DeleteNode(kluster *kubernikus_v1.Kluster, ID string) error {\nprovider, err := c.klusterClientFor(kluster)\nif err != nil {\n@@ -620,128 +537,6 @@ func (c *client) GetRegion() (string, error) {\nreturn region, nil\n}\n-func (c *client) GetWormholeForeignPort(kluster *kubernikus_v1.Kluster) (string, error) {\n- provider, err := c.klusterClientFor(kluster)\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create foreign wormhole port: %v\", err)\n- }\n-\n- client, err := openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create foreign wormhole port: %v\", err)\n- }\n-\n- name := fmt.Sprintf(\"kubernikus:wormhole-foreign-%v\", kluster.Name)\n- id, err := ports.IDFromName(client, name)\n- if err != nil {\n- return \"\", err\n- }\n-\n- port, err := ports.Get(client, id).Extract()\n- if err != nil {\n- return \"\", err\n- }\n-\n- return port.ID, nil\n-}\n-\n-func (c *client) GetWormholeLocalPort(kluster *kubernikus_v1.Kluster) (string, error) {\n- provider, err := c.controlPlaneClient()\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create local wormhole port: %v\", err)\n- }\n-\n- client, err := openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create local wormhole port: %v\", err)\n- }\n-\n- name := fmt.Sprintf(\"kubernikus:wormhole-local-%v\", kluster.Name)\n- id, err := ports.IDFromName(client, name)\n- if err != nil {\n- return \"\", err\n- }\n-\n- port, err := ports.Get(client, id).Extract()\n- if err != nil {\n- return \"\", err\n- }\n-\n- return port.ID, nil\n-}\n-\n-func (c *client) CreateWormholeLocalPort(kluster *kubernikus_v1.Kluster, projectID, networkID string) (string, error) {\n- provider, err := c.controlPlaneClient()\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create local wormhole port: %v\", err)\n- }\n-\n- client, err := openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create local wormhole port: %v\", err)\n- }\n-\n- name := fmt.Sprintf(\"kubernikus:wormhole-local-%v\", kluster.Name)\n- port, err := ports.Create(client, ports.CreateOpts{\n- Name: name,\n- NetworkID: networkID,\n- }).Extract()\n-\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create local wormhole port: %v\", err)\n- }\n-\n- return port.ID, nil\n-}\n-\n-func (c *client) CreateWormholeForeignPort(kluster *kubernikus_v1.Kluster) (string, error) {\n- provider, err := c.klusterClientFor(kluster)\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create foreign wormhole port: %v\", err)\n- }\n-\n- client, err := openstack.NewNetworkV2(provider, gophercloud.EndpointOpts{})\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create foreign wormhole port: %v\", err)\n- }\n-\n- name := fmt.Sprintf(\"kubernikus:wormhole-foreign-%v\", kluster.Name)\n- port, err := ports.Create(client, ports.CreateOpts{\n- Name: name,\n- NetworkID: kluster.Spec.OpenstackInfo.NetworkID,\n- }).Extract()\n-\n- if err != nil {\n- return \"\", fmt.Errorf(\"Couldn't create foreign wormhole port: %v\", err)\n- }\n-\n- return port.ID, nil\n-}\n-\n-func (c *client) FindOrCreateWormholeForeignPort(kluster *kubernikus_v1.Kluster, networkID string) (string, error) {\n- id, err := c.GetWormholeForeignPort(kluster)\n- if err != nil {\n- if _, ok := err.(gophercloud.ErrResourceNotFound); ok {\n- return c.CreateWormholeForeignPort(kluster)\n- } else {\n- return \"\", fmt.Errorf(\"Couldn't find or create foreign wormhole port: %v\", err)\n- }\n- }\n- return id, nil\n-}\n-\n-func (c *client) FindOrCreateWormholeLocalPort(kluster *kubernikus_v1.Kluster, projectID, networkID string) (string, error) {\n- id, err := c.GetWormholeLocalPort(kluster)\n- if err != nil {\n- if _, ok := err.(gophercloud.ErrResourceNotFound); ok {\n- return c.CreateWormholeLocalPort(kluster, projectID, networkID)\n- } else {\n- return \"\", fmt.Errorf(\"Couldn't find or create local wormhole port: %v\", err)\n- }\n- }\n- return id, nil\n-}\n-\nfunc ExtractServers(r pagination.Page) ([]Node, error) {\nvar s []Node\nerr := servers.ExtractServersInto(r, &s)\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/operator.go",
"new_path": "pkg/controller/operator.go",
"diff": "@@ -156,8 +156,6 @@ func NewKubernikusOperator(options *KubernikusOperatorOptions) *KubernikusOperat\no.Config.Kubernikus.Controllers[\"groundctl\"] = NewGroundController(o.Factories, o.Clients, o.Config)\ncase \"launchctl\":\no.Config.Kubernikus.Controllers[\"launchctl\"] = NewLaunchController(o.Factories, o.Clients)\n- case \"wormholegenerator\":\n- o.Config.Kubernikus.Controllers[\"wormholegenerator\"] = NewWormholeGenerator(o.Factories, o.Clients, o.Config)\n}\n}\n"
},
{
"change_type": "DELETE",
"old_path": "pkg/controller/wormhole.go",
"new_path": null,
"diff": "-package controller\n-\n-import (\n- \"fmt\"\n- \"time\"\n-\n- \"github.com/golang/glog\"\n- \"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n- \"github.com/sapcc/kubernikus/pkg/client/openstack\"\n- \"github.com/sapcc/kubernikus/pkg/controller/config\"\n-)\n-\n-type WormholeGenerator struct {\n- Base\n- config.Config\n-}\n-\n-type State struct {\n- key string\n- kluster *v1.Kluster\n- node *openstack.Node\n- message string\n-}\n-\n-type Transition func(*State) (Transition, error)\n-\n-func NewWormholeGenerator(factories Factories, clients Clients, config config.Config) config.Controller {\n- informers := factories.Kubernikus.Kubernikus().V1().Klusters().Informer()\n-\n- wg := &WormholeGenerator{\n- NewBaseController(clients, informers),\n- config,\n- }\n-\n- wg.Controller = interface{}(wg).(BaseController)\n-\n- return wg\n-}\n-\n-func (wg *WormholeGenerator) reconcile(key string) error {\n- var err error\n- state := &State{key: key}\n- transition := wg.start\n-\n- for transition != nil && err == nil {\n- transition, err = transition(state)\n- if state.message != \"\" {\n- glog.V(5).Infof(\"[%v] %v\", key, state.message)\n- state.message = \"\"\n- }\n- }\n-\n- return err\n-}\n-\n-func (wg *WormholeGenerator) start(state *State) (Transition, error) {\n- obj, exists, err := wg.informer.GetIndexer().GetByKey(state.key)\n- if err != nil {\n- return nil, fmt.Errorf(\"Failed to fetch key %s from cache: %s\", state.key, err)\n- }\n-\n- if !exists {\n- state.message = \"Kluster deleted in the meantime\"\n- return nil, nil\n- }\n-\n- state.kluster = obj.(*v1.Kluster)\n-\n- return wg.findOrCreateWormhole, nil\n-}\n-\n-func (wg *WormholeGenerator) findOrCreateWormhole(state *State) (Transition, error) {\n- wormhole, err := wg.Clients.Openstack.GetWormhole(state.kluster)\n- if err != nil {\n- return nil, fmt.Errorf(\"Couldn't get wormhole VM: %v\", err)\n- }\n-\n- if wormhole == nil {\n- state.message = \"Wormhole does not exist. Need to create it.\"\n- return wg.createWormhole, nil\n- }\n-\n- state.node = wormhole\n- state.message = fmt.Sprintf(\"Found wormhole: %v\", wormhole.Name)\n- return wg.checkWormhole, nil\n-}\n-\n-func (wg *WormholeGenerator) checkWormhole(state *State) (Transition, error) {\n- if state.node.Running() {\n- state.message = \"Wormhole ok\"\n- return nil, nil\n- }\n-\n- if state.node.Starting() {\n- if time.Since(state.node.Created) < 5*time.Minute {\n- state.message = \"Wormhole still spawning\"\n- return wg.requeue, nil\n- } else {\n- state.message = \"Wormhole hangs while spawning\"\n- return wg.repairWormhole, nil\n- }\n- }\n-\n- if state.node.Stopping() {\n- if time.Since(state.node.Updated) < 5*time.Minute {\n- state.message = \"Wormhole still stopping\"\n- return wg.requeue, nil\n- } else {\n- state.message = \"Wormhole hangs while terminating\"\n- return wg.repairWormhole, nil\n- }\n- }\n-\n- return nil, fmt.Errorf(\"Wormhole is in an undefined state. If this happens the universe collapses.\")\n-}\n-\n-func (wg *WormholeGenerator) repairWormhole(state *State) (Transition, error) {\n- err := wg.Clients.Openstack.DeleteNode(state.kluster, state.node.ID)\n- if err != nil {\n- return nil, fmt.Errorf(\"Couldn't repair wormhole %v: %v\", state.node.Name, err)\n- }\n- state.message = fmt.Sprintf(\"Terminated wormhole %v\", state.node.Name)\n- return wg.requeue, nil\n-}\n-\n-func (wg *WormholeGenerator) createWormhole(state *State) (Transition, error) {\n- name, err := wg.Clients.Openstack.CreateWormhole(state.kluster, wg.Config.Kubernikus.ProjectID, wg.Config.Kubernikus.NetworkID)\n- if err != nil {\n- return nil, err\n- }\n-\n- state.message = fmt.Sprintf(\"Wormhole %v ceated\", name)\n- return wg.requeue, nil\n-}\n-\n-func (wg *WormholeGenerator) requeue(state *State) (Transition, error) {\n- wg.queue.AddAfter(state.key, 10*time.Second)\n- return nil, nil\n-}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | delete openstack wormhole :/ |
596,240 | 26.09.2017 17:58:41 | -7,200 | 1907d65bbc607ef4836c1bfa1c3ae7402a697d87 | use short form to make rkt use the host's DNS settings | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -44,8 +44,7 @@ systemd:\n[Service]\nEnvironment=\"RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \\\n- --volume=resolv,kind=host,source=/etc/resolv.conf \\\n- --mount volume=resolv,target=/etc/resolv.conf \\\n+ --net=host \\\n--volume var-log,kind=host,source=/var/log \\\n--mount volume=var-log,target=/var/log\"\nEnvironment=\"KUBELET_IMAGE_TAG=v1.7.5_coreos.0\"\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | use short form to make rkt use the host's DNS settings |
596,240 | 26.09.2017 18:15:22 | -7,200 | a5406bd6db261b80d0a8feb72e5f811f4214a01b | mounts a host directory for kubelet restart save IPAM persistence for pod IPs | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -45,11 +45,14 @@ systemd:\n[Service]\nEnvironment=\"RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \\\n--net=host \\\n+ --volume var-lib-cni,kind=host,source=/var/lib/cni \\\n--volume var-log,kind=host,source=/var/log \\\n+ --mount volume=var-lib-cni,target=/var/lib/cni \\\n--mount volume=var-log,target=/var/log\"\nEnvironment=\"KUBELET_IMAGE_TAG=v1.7.5_coreos.0\"\nEnvironment=\"KUBELET_IMAGE_URL=quay.io/coreos/hyperkube\"\nExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests\n+ ExecStartPre=/bin/mkdir -p /var/lib/cni\nExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid\nExecStart=/usr/lib/coreos/kubelet-wrapper \\\n--cloud-config=/etc/kubernetes/openstack/openstack.config \\\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | mounts a host directory for kubelet restart save IPAM persistence for pod IPs |
596,240 | 29.09.2017 10:53:32 | -7,200 | 796564e4c711bba8f815226734098cac0ce7b8a4 | makes external IP required | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/k8sniff-service.yaml",
"new_path": "charts/kubernikus/templates/k8sniff-service.yaml",
"diff": "@@ -11,4 +11,4 @@ spec:\nselector:\nrole: k8sniff-ingress-lb\nexternalIPs:\n- - {{ .Values.k8sniff.external_service_ip }}\n+ - {{ required \"missing k8sniff.external_service_ip\" .Values.k8sniff.external_service_ip }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | makes external IP required |
596,240 | 29.09.2017 16:10:07 | -7,200 | d17c33ba7456a02b6ffe3bee468b7fc041531cf4 | decouples k8sniff chars | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/k8sniff/Chart.yaml",
"diff": "+apiVersion: v1\n+description: A Helm chart for k8sniff\n+name: k8sniff\n+version: 0.1.0\n"
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus/templates/k8sniff-configmap.yaml",
"new_path": "charts/k8sniff/templates/configmap.yaml",
"diff": "@@ -11,7 +11,7 @@ data:\n},\n\"metrics\": {\n\"host\": \"0.0.0.0\",\n- \"port\": {{ default 9091 .Values.k8sniff.metrics_port }},\n+ \"port\": {{ default 9091 .Values.metrics_port }},\n\"path\": \"/metrics\"\n},\n\"kubernetes\": {}\n"
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus/templates/k8sniff-deployment.yaml",
"new_path": "charts/k8sniff/templates/deployment.yaml",
"diff": "@@ -6,7 +6,7 @@ metadata:\nrole: k8sniff-ingress-lb\nannotations:\nprometheus.io/scrape: \"true\"\n- prometheus.io/port: {{ default \"9091\" .Values.k8sniff.metrics_port | quote }}\n+ prometheus.io/port: {{ default \"9091\" .Values.metrics_port | quote }}\nspec:\nreplicas: 1\n@@ -19,14 +19,14 @@ spec:\nrole: k8sniff-ingress-lb\nspec:\ncontainers:\n- - image: {{ default \"kubermatic/k8sniff\" .Values.k8sniff.image }}:{{ default \"v1.0\" .Values.k8sniff.tag }}\n+ - image: {{ default \"kubermatic/k8sniff\" .Values.image }}:{{ default \"v1.0\" .Values.tag }}\nname: k8sniff-ingress-lb\nimagePullPolicy: IfNotPresent\ncommand:\n- /bin/sh\n- -c\n- -x\n- - \"/pipeline/source/k8sniff -logtostderr --v={{ default 9 .Values.k8sniff.log_level }} --config /etc/config/k8sniff.json\"\n+ - \"/pipeline/source/k8sniff -logtostderr --v={{ default 9 .Values.log_level }} --config /etc/config/k8sniff.json\"\nports:\n- name: https\ncontainerPort: 8443\n"
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus/templates/k8sniff-service.yaml",
"new_path": "charts/k8sniff/templates/service.yaml",
"diff": "@@ -11,4 +11,4 @@ spec:\nselector:\nrole: k8sniff-ingress-lb\nexternalIPs:\n- - {{ required \"missing k8sniff.external_service_ip\" .Values.k8sniff.external_service_ip }}\n+ - {{ required \"missing external_service_ip\" .Values.external_service_ip }}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/k8sniff/values.yaml",
"diff": "+image: \"kubermatic/k8sniff\"\n+tag: \"8d5bf771eb906c58acfdd68e553f9408432043fa\"\n+metrics_port: 9091\n+log_level: 9\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus/requirements.lock",
"diff": "+dependencies:\n+- name: k8sniff\n+ repository: file://../k8sniff\n+ version: 0.1.0\n+digest: sha256:447679c03b7598e24089180971ec59ec510f5fec4d7bae27bec971df87206de9\n+generated: 2017-09-29T15:57:19.99321657+02:00\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus/requirements.yaml",
"diff": "+dependencies:\n+ - name: k8sniff\n+ repository: \"file://../k8sniff\"\n+ version: 0.1.0\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | decouples k8sniff chars |
596,240 | 29.09.2017 16:11:51 | -7,200 | 89d78adb437bccac2bc3a80af92433d5de69550b | generates certificates automatically | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/ingress.yaml",
"new_path": "charts/kubernikus/templates/ingress.yaml",
"diff": "@@ -3,13 +3,15 @@ kind: Ingress\nmetadata:\nname: kubernikus-api\n+ annotations:\n+ vice-president: \"true\"\nspec:\ntls:\n- secretName: kubernikus-api\n- hosts: [kubernikus.{{.Values.openstack.region}}.cloud.sap]\n+ hosts: [{{.Values.kubernikus.domain}}]\nrules:\n- - host: kubernikus.{{.Values.openstack.region}}.cloud.sap\n+ - host: {{.Values.kubernikus.domain}}\nhttp:\npaths:\n- path: /\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | generates certificates automatically |
596,240 | 29.09.2017 16:12:14 | -7,200 | bdbe910a9b570b986e2bfb30ffe8bba28ea6500a | only deploy secret when certificates are manually added | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/secret.yaml",
"new_path": "charts/kubernikus/templates/secret.yaml",
"diff": "+{{- if .Values.api.tls_crt}}\napiVersion: v1\nkind: Secret\ntype: Opaque\n@@ -8,3 +9,4 @@ metadata:\ndata:\ntls.crt: {{ default \"\" .Values.api.tls_crt | b64enc | quote }}\ntls.key: {{ default \"\" .Values.api.tls_key | b64enc | quote }}\n+{{- end }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | only deploy secret when certificates are manually added |
596,240 | 29.09.2017 16:33:43 | -7,200 | 421a465d8ad60a32599a1f0adc65bd566ad635a9 | fixes deployment. remove again when pipeline is fixed | [
{
"change_type": "ADD",
"old_path": "charts/kubernikus/charts/k8sniff-0.1.0.tgz",
"new_path": "charts/kubernikus/charts/k8sniff-0.1.0.tgz",
"diff": "Binary files /dev/null and b/charts/kubernikus/charts/k8sniff-0.1.0.tgz differ\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/requirements.yaml",
"new_path": "charts/kubernikus/requirements.yaml",
"diff": "dependencies:\n- name: k8sniff\n- repository: \"file://../k8sniff\"\n+ repository: file://../k8sniff\nversion: 0.1.0\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fixes deployment. remove again when pipeline is fixed |
596,230 | 04.10.2017 10:12:15 | -7,200 | d5357d931d58c115d50f5bed1d82b9d5b446f028 | provide docker_opts for node ignition template fixes | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -36,6 +36,13 @@ systemd:\n[Install]\nWantedBy=multi-user.target\n+ - name: docker.service\n+ enable: true\n+ dropins:\n+ - name: 20-docker-opts.conf\n+ contents: |\n+ [Service]\n+ Environment=\"DOCKER_OPTS=--log-opt max-size=5m --log-opt max-file=5 --ip-masq=false --iptables=false --bridge=none\"\n- name: kubelet.service\nenable: true\ncontents: |\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | -- provide docker_opts for node ignition template fixes #64 |
596,240 | 04.10.2017 09:49:57 | -7,200 | f90564e7780a73aa7fa1bbf088f4e0328d0b7233 | updates pipeline to deploy admin-staging | [
{
"change_type": "DELETE",
"old_path": "charts/kubernikus/templates/seed.yaml",
"new_path": null,
"diff": "-apiVersion: \"openstack.stable.sap.cc/v1\"\n-kind: \"OpenstackSeed\"\n-metadata:\n- name: kubernikus-seed\n- labels:\n- app: kubernikus\n- chart: \"{{ .Chart.Name }}-{{ .Chart.Version }}\"\n-spec:\n- requires:\n- #- monsoon3/keystone-seed # uncomment once keystone is deployed via its own helm-charts chart\n- - monsoon3/domain-default-seed\n- - monsoon3/domain-ccadmin-seed\n- roles:\n- - kubernetes_admin\n- domains:\n- - name: Default\n- users:\n- - name: {{ default \"kubernikus\" .Values.openstack.auth_user_id | quote }}\n- description: 'Kubernikus'\n- password: {{ .Values.openstack.auth_user_password | quote }}\n- roles:\n- - project: service\n- role: service\n- - project: cloud_admin@ccadmin\n- role: admin\n- - project: cloud_admin@ccadmin\n- role: cloud_compute_admin\n- - project: cloud_admin@ccadmin\n- role: cloud_dns_admin\n- - project: cloud_admin@ccadmin\n- role: cloud_network_admin\n- - domain: Default\n- role: admin\n- - domain: ccadmin\n- role: admin\n-\n- services:\n- - name: Kubernikus\n- type: kubernikus\n- description: 'Kubernikus service'\n- endpoints:\n- - interface: public\n- region: '{{.Values.openstack.region}}'\n- url: 'https://kubernikus.{{.Values.openstack.region}}.cloud.sap'\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -102,6 +102,34 @@ jobs:\nGITHUB_TOKEN: {{github-access-token}}\non_failure:\n<<: *post_failure_to_slack\n+\n+ - name: admin-staging\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: kubernikus.git\n+ trigger: true\n+ passed: [build]\n+ - get: kubernikus.version\n+ passed: [build]\n+ - get: secrets.git\n+\n+ - task: deploy\n+ file: kubernikus.git/ci/task-helm-upgrade.yaml\n+ params:\n+ REGION: admin\n+ RELEASE: kubernikus-staging\n+ VALUES: kubernikus-staging.yaml\n+ NAMESPACE: kubernikus-staging\n+ GITHUB_TOKEN: ((github-access-token))\n+ - task: prune replicasets\n+ file: kubernikus.git/ci/prune-replicasets.yaml\n+ params:\n+ REGION: admin\n+ GITHUB_TOKEN: {{github-access-token}}\n+ on_failure:\n+ <<: *post_failure_to_slack\n+\n- name: eu-nl-1\nserial: true\nplan:\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task-helm-upgrade.yaml",
"new_path": "ci/task-helm-upgrade.yaml",
"diff": "@@ -20,7 +20,7 @@ run:\nset -exo pipefail\nVERSION=$(cat kubernikus.version/version)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade kubernikus kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/kubernikus.yaml --set imageTag=$VERSION\n+ helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$VALUES --set imageTag=$VERSION\nset +x\nkubectl get deployments --namespace=$NAMESPACE -o jsonpath='{.items[*].metadata.name}' | tr ' ' '\\n' | grep kubernikus | while read DEPLOYMENT; do\nset -x\n@@ -43,5 +43,7 @@ params:\nSTEP: 2\nTIMEOUT: 300\nNAMESPACE: kube-system\n+ RELEASE: kubernikus\n+ VALUES: kubernikus.yaml\nREGION:\nGITHUB_TOKEN:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | updates pipeline to deploy admin-staging |
596,240 | 04.10.2017 10:34:40 | -7,200 | 7cc9f9adb1b29d0cbc325bdddc6a4372d58b2e15 | makes defaults overwritable | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -94,6 +94,8 @@ jobs:\nfile: kubernikus.git/ci/task-helm-upgrade.yaml\nparams:\nREGION: staging\n+ RELEASE: kubernikus\n+ NAMESPACE: kubernikus\nGITHUB_TOKEN: ((github-access-token))\n- task: prune replicasets\nfile: kubernikus.git/ci/prune-replicasets.yaml\n@@ -119,7 +121,6 @@ jobs:\nparams:\nREGION: admin\nRELEASE: kubernikus-staging\n- VALUES: kubernikus-staging.yaml\nNAMESPACE: kubernikus-staging\nGITHUB_TOKEN: ((github-access-token))\n- task: prune replicasets\n@@ -145,6 +146,8 @@ jobs:\nfile: kubernikus.git/ci/task-helm-upgrade.yaml\nparams:\nREGION: eu-nl-1\n+ RELEASE: kubernikus\n+ NAMESPACE: kubernikus\nGITHUB_TOKEN: ((github-access-token))\n- task: prune replicasets\nfile: kubernikus.git/ci/prune-replicasets.yaml\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task-helm-upgrade.yaml",
"new_path": "ci/task-helm-upgrade.yaml",
"diff": "@@ -20,7 +20,7 @@ run:\nset -exo pipefail\nVERSION=$(cat kubernikus.version/version)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$VALUES --set imageTag=$VERSION\n+ helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$RELEASE.yaml --set imageTag=$VERSION\nset +x\nkubectl get deployments --namespace=$NAMESPACE -o jsonpath='{.items[*].metadata.name}' | tr ' ' '\\n' | grep kubernikus | while read DEPLOYMENT; do\nset -x\n@@ -42,8 +42,7 @@ run:\nparams:\nSTEP: 2\nTIMEOUT: 300\n- NAMESPACE: kube-system\n- RELEASE: kubernikus\n- VALUES: kubernikus.yaml\n+ NAMESPACE:\n+ RELEASE:\nREGION:\nGITHUB_TOKEN:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | makes defaults overwritable |
596,240 | 04.10.2017 15:00:03 | -7,200 | 1cbce7687e21d507d7124a8f12bec073d9270bff | fixes DNS kubelet foo | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -51,6 +51,8 @@ systemd:\n[Service]\nEnvironment=\"RKT_RUN_ARGS=--uuid-file-save=/var/run/kubelet-pod.uuid \\\n+ --inherit-env \\\n+ --dns=host \\\n--net=host \\\n--volume var-lib-cni,kind=host,source=/var/lib/cni \\\n--volume var-log,kind=host,source=/var/log \\\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fixes DNS kubelet foo |
596,240 | 04.10.2017 15:59:32 | -7,200 | 8f655b2b023ab909429fc5569f481ac13e8d7fa9 | adds aCcept header for cors | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/rest/configure_kubernikus.go",
"new_path": "pkg/api/rest/configure_kubernikus.go",
"diff": "@@ -84,7 +84,7 @@ func setupMiddlewares(handler http.Handler) http.Handler {\n// So this is a good place to plug in a panic handling middleware, logging and metrics\nfunc setupGlobalMiddleware(handler http.Handler) http.Handler {\nc := cors.New(cors.Options{\n- AllowedHeaders: []string{\"X-Auth-Token\", \"Content-Type\"},\n+ AllowedHeaders: []string{\"X-Auth-Token\", \"Content-Type\", \"Accept\"},\nAllowedMethods: []string{\"GET\", \"HEAD\", \"POST\", \"DELETE\", \"PUT\"},\n})\nreturn gmiddleware.LoggingHandler(os.Stdout, handlers.RootHandler(c.Handler(handler)))\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds aCcept header for cors |
596,240 | 04.10.2017 16:30:55 | -7,200 | c9e4031f136a2f142cbfa67f04539d5d7bab5fc2 | updates prune tasks with configurable namespace | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -71,8 +71,8 @@ jobs:\ncache: true\ncache_tag: latest\nbuild_args:\n- http_proxy: http://proxy.wdf.sap.corp:8080\n- https_proxy: http://proxy.wdf.sap.corp:8080\n+ http_proxy: http://proxy.phl.sap.corp:8080\n+ https_proxy: http://proxy.phl.sap.corp:8080\nno_proxy: sap.corp,cloud.sap,127.0.0.1,localhost\nget_params:\nskip_download: true\n@@ -95,12 +95,13 @@ jobs:\nparams:\nREGION: staging\nRELEASE: kubernikus\n- NAMESPACE: kubernikus\n+ NAMESPACE: kube-system\nGITHUB_TOKEN: ((github-access-token))\n- task: prune replicasets\nfile: kubernikus.git/ci/prune-replicasets.yaml\nparams:\nREGION: staging\n+ NAMESPACE: kube-system\nGITHUB_TOKEN: {{github-access-token}}\non_failure:\n<<: *post_failure_to_slack\n@@ -127,6 +128,7 @@ jobs:\nfile: kubernikus.git/ci/prune-replicasets.yaml\nparams:\nREGION: admin\n+ NAMESPACE: kubernikus-staging\nGITHUB_TOKEN: {{github-access-token}}\non_failure:\n<<: *post_failure_to_slack\n@@ -147,12 +149,13 @@ jobs:\nparams:\nREGION: eu-nl-1\nRELEASE: kubernikus\n- NAMESPACE: kubernikus\n+ NAMESPACE: kube-system\nGITHUB_TOKEN: ((github-access-token))\n- task: prune replicasets\nfile: kubernikus.git/ci/prune-replicasets.yaml\nparams:\nREGION: eu-nl-1\n+ NAMESPACE: kube-system\nGITHUB_TOKEN: {{github-access-token}}\non_failure:\n<<: *post_failure_to_slack\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/prune-replicasets.yaml",
"new_path": "ci/prune-replicasets.yaml",
"diff": "@@ -26,6 +26,6 @@ run:\nparams:\nKEEP: 3\n- NAMESPACE: kube-system\n+ NAMESPACE:\nREGION:\nGITHUB_TOKEN:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | updates prune tasks with configurable namespace |
596,240 | 04.10.2017 22:43:25 | -7,200 | 408d651fe40f53e925299561375dcf0f0c4107a5 | now also with kubectl 1.7.7 with some new extra feature | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -116,20 +116,13 @@ jobs:\n- get: kubernikus.version\npassed: [build]\n- get: secrets.git\n-\n- task: deploy\n- file: kubernikus.git/ci/task-helm-upgrade.yaml\n+ file: kubernikus.git/ci/task-helm-upgrade-v1.7.7.yaml\nparams:\nREGION: admin\nRELEASE: kubernikus-staging\nNAMESPACE: kubernikus-staging\nGITHUB_TOKEN: ((github-access-token))\n- - task: prune replicasets\n- file: kubernikus.git/ci/prune-replicasets.yaml\n- params:\n- REGION: admin\n- NAMESPACE: kubernikus-staging\n- GITHUB_TOKEN: {{github-access-token}}\non_failure:\n<<: *post_failure_to_slack\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "ci/task-helm-upgrade-v1.7.7.yaml",
"diff": "+---\n+platform: 'linux'\n+\n+image_resource:\n+ type: docker-image\n+ source:\n+ repository: hub.global.cloud.sap/monsoon/kubectl\n+ tag: 'v1.7.7'\n+\n+inputs:\n+ - name: kubernikus.git\n+ - name: kubernikus.version\n+ - name: secrets.git\n+\n+run:\n+ path: /bin/sh\n+ args:\n+ - -c\n+ - |\n+ set -exo pipefail\n+ VERSION=$(cat kubernikus.version/version)\n+ helm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n+ helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$RELEASE.yaml --set imageTag=$VERSION\n+ kubectl rollout status deployment/kubernikus-api --namespace=$NAMESPACE\n+ kubectl rollout status deployment/kubernikus-operator --namespace=$NAMESPACE\n+\n+params:\n+ NAMESPACE:\n+ RELEASE:\n+ REGION:\n+ GITHUB_TOKEN:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | now also with kubectl 1.7.7 with some new extra feature |
596,240 | 04.10.2017 23:13:32 | -7,200 | 588adf9f84cd16ece78cc2f726fb57f9f80207fc | fetches serverurl from kluster spec | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/get_cluster_credentials.go",
"new_path": "pkg/api/handlers/get_cluster_credentials.go",
"diff": "@@ -2,7 +2,6 @@ package handlers\nimport (\n\"crypto/x509\"\n- \"fmt\"\n\"github.com/ghodss/yaml\"\n\"github.com/go-openapi/runtime/middleware\"\n@@ -33,6 +32,15 @@ func (d *getClusterCredentials) Handle(params operations.GetClusterCredentialsPa\n}\nreturn NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 500, err.Error())\n}\n+\n+ kluster, err := d.Kubernikus.Kubernikus().Klusters(d.Namespace).Get(qualifiedName(params.Name, principal.Account), v1.GetOptions{})\n+ if err != nil {\n+ if apierrors.IsNotFound(err) {\n+ return NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 404, \"Not found\")\n+ }\n+ return NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 500, err.Error())\n+ }\n+\nclientCAKey, ok := secret.Data[\"apiserver-clients-ca-key.pem\"]\nif !ok {\nreturn NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 500, \"Clients CA key not found\")\n@@ -59,7 +67,7 @@ func (d *getClusterCredentials) Handle(params operations.GetClusterCredentialsPa\nconfig := kubernetes.NewClientConfigV1(\nparams.Name,\nprincipal.Name,\n- fmt.Sprintf(\"https://%s.kluster.staging.cloud.sap\", qualifiedName(params.Name, principal.Account)),\n+ kluster.Spec.KubernikusInfo.ServerURL,\ncertutil.EncodePrivateKeyPEM(cert.PrivateKey),\ncertutil.EncodeCertPEM(cert.Certificate),\nserverCACert,\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fetches serverurl from kluster spec |
596,237 | 05.10.2017 10:43:23 | -7,200 | 2026e986de22c2e33a2cf4d930dda3793cb1ce17 | caches cors preflight request for 10 min | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/rest/configure_kubernikus.go",
"new_path": "pkg/api/rest/configure_kubernikus.go",
"diff": "@@ -86,6 +86,7 @@ func setupGlobalMiddleware(handler http.Handler) http.Handler {\nc := cors.New(cors.Options{\nAllowedHeaders: []string{\"X-Auth-Token\", \"Content-Type\", \"Accept\"},\nAllowedMethods: []string{\"GET\", \"HEAD\", \"POST\", \"DELETE\", \"PUT\"},\n+ MaxAge: 600,\n})\nreturn gmiddleware.LoggingHandler(os.Stdout, handlers.RootHandler(c.Handler(handler)))\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | caches cors preflight request for 10 min |
596,240 | 05.10.2017 12:57:08 | -7,200 | f55e7dd7f304a9850d0353cf1294c2cc942fddc6 | inits kubernikusctl kubelet plugin | [
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "@@ -3,7 +3,7 @@ DATE = $(shell date +%Y%m%d%H%M)\nIMAGE ?= sapcc/kubernikus\nVERSION ?= latest\nGOOS ?= $(shell go env | grep GOOS | cut -d'\"' -f2)\n-BINARIES := apiserver kubernikus wormhole\n+BINARIES := apiserver kubernikus kubernikusctl wormhole\nLDFLAGS := -X github.com/sapcc/kubernikus/pkg/version.VERSION=$(VERSION)\nGOFLAGS := -ldflags \"$(LDFLAGS) -s -w\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "cmd/kubernikusctl/main.go",
"diff": "+package main\n+\n+import (\n+ \"os\"\n+ \"path/filepath\"\n+\n+ \"github.com/golang/glog\"\n+\n+ \"github.com/sapcc/kubernikus/pkg/cmd\"\n+ \"github.com/sapcc/kubernikus/pkg/cmd/kubernikusctl\"\n+)\n+\n+func main() {\n+ defer glog.Flush()\n+\n+ baseName := filepath.Base(os.Args[0])\n+\n+ err := kubernikusctl.NewCommand(baseName).Execute()\n+ cmd.CheckError(err)\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "+package kubernikusctl\n+\n+import (\n+ \"fmt\"\n+ \"os\"\n+\n+ \"github.com/gophercloud/gophercloud\"\n+ \"github.com/gophercloud/gophercloud/openstack\"\n+ \"github.com/gophercloud/gophercloud/openstack/identity/v3/tokens\"\n+ \"github.com/sapcc/kubernikus/pkg/cmd\"\n+ \"github.com/spf13/cobra\"\n+ \"github.com/spf13/pflag\"\n+)\n+\n+func NewCredentialsCommand() *cobra.Command {\n+ o := NewCredentialsOptions()\n+\n+ c := &cobra.Command{\n+ Use: \"credentials\",\n+ Short: \"Fetches Kubernikus credentials via API\",\n+ Run: func(c *cobra.Command, args []string) {\n+ cmd.CheckError(o.Validate(c, args))\n+ cmd.CheckError(o.Complete(args))\n+ cmd.CheckError(o.Run(c))\n+ },\n+ }\n+\n+ o.BindFlags(c.Flags())\n+\n+ return c\n+}\n+\n+type CredentialsOptions struct {\n+ Name string\n+}\n+\n+func NewCredentialsOptions() *CredentialsOptions {\n+ return &CredentialsOptions{}\n+}\n+\n+func (o *CredentialsOptions) BindFlags(flags *pflag.FlagSet) {\n+}\n+\n+func (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\n+ return nil\n+}\n+\n+func (o *CredentialsOptions) Complete(args []string) error {\n+ return nil\n+}\n+\n+func (o *CredentialsOptions) Run(c *cobra.Command) error {\n+ token, err := getToken()\n+ if err != nil {\n+ return err\n+ }\n+\n+ fmt.Println(token)\n+ return nil\n+}\n+\n+func getToken() (string, error) {\n+ authOptions := authOptionsFromENV()\n+\n+ provider, err := openstack.NewClient(authOptions.IdentityEndpoint)\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ err = openstack.AuthenticateV3(provider, authOptions, gophercloud.EndpointOpts{})\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ return provider.TokenID, nil\n+}\n+\n+func authOptionsFromENV() *tokens.AuthOptions {\n+ return &tokens.AuthOptions{\n+ IdentityEndpoint: os.Getenv(\"OS_AUTH_URL\"),\n+ Username: os.Getenv(\"OS_USERNAME\"),\n+ Password: os.Getenv(\"OS_PASSWORD\"),\n+ DomainName: os.Getenv(\"OS_USER_DOMAIN_NAME\"),\n+ AllowReauth: true,\n+ Scope: tokens.Scope{\n+ ProjectName: os.Getenv(\"OS_PROJECT_NAME\"),\n+ DomainName: os.Getenv(\"OS_PROJECT_DOMAIN_NAME\"),\n+ },\n+ }\n+}\n+\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/cmd/kubernikusctl/kubernikusctl.go",
"diff": "+package kubernikusctl\n+\n+import (\n+ \"github.com/spf13/cobra\"\n+)\n+\n+func NewCommand(name string) *cobra.Command {\n+ c := &cobra.Command{\n+ Use: name,\n+ Short: \"Kubernikus Kubectl Plugin\",\n+ Long: \"Plugin that extends kubectl with Kubernikus convinience features\",\n+ }\n+\n+ c.AddCommand(\n+ NewCredentialsCommand(),\n+ )\n+\n+ return c\n+}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | inits kubernikusctl kubelet plugin |
596,240 | 06.10.2017 14:05:04 | -7,200 | d3dacae1ac5b50222579ed05a57828f6cb1e8a8e | improves(?) error handling | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -113,20 +113,20 @@ func (o *CredentialsOptions) Complete(args []string) error {\nif err := o.setupOpenstackClients(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"Openstack clients couldn't be created.\")\n+ return errors.Errorf(\"Openstack clients couldn't be created\")\n}\nfmt.Printf(\"Authenticating %v/%v at %v/%v\\n\", o.auth.DomainName, o.auth.Username, o.auth.Scope.DomainName, o.auth.Scope.ProjectName)\nif err := o.authenticate(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"Authentication failed.\")\n+ return errors.Errorf(\"Authentication failed\")\n}\nif o.host == \"\" {\nfmt.Println(\"Auto-Detectng Kubernikus Host...\")\nif o.host, err = o.autoDetectKubernikusHost(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"You need to provide --host. Auto-Detection failed.\")\n+ return errors.Errorf(\"You need to provide --host. Auto-Detection failed\")\n}\n}\n@@ -141,7 +141,7 @@ func (o *CredentialsOptions) Complete(args []string) error {\nfmt.Println(\"Auto-Detecting Kubernikus Cluster...\")\nif o.name, err = o.autoDetectClusterName(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"You need to provide --host. Auto-Detection failed.\")\n+ return errors.Errorf(\"You need to provide --host. Auto-Detection failed\")\n}\n}\n@@ -153,13 +153,13 @@ func (o *CredentialsOptions) Run(c *cobra.Command) error {\nkubeconfig, err := o.fetchCredentials()\nif err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"Couldn't fetch credentials from Kubernikus API.\")\n+ return errors.Wrap(err, \"Couldn't fetch credentials from Kubernikus API\")\n}\nerr = o.mergeAndPersist(kubeconfig)\nif err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"Couldn't merge existing kubeconfig with fetched credentials.\")\n+ return errors.Errorf(\"Couldn't merge existing kubeconfig with fetched credentials\")\n}\nfmt.Printf(\"Wrote merged kubeconfig to %v\\n\", clientcmd.NewDefaultPathOptions().GetDefaultFilename())\n@@ -171,11 +171,11 @@ func (o *CredentialsOptions) setupOpenstackClients() error {\nvar err error\nif o.provider, err = openstack.NewClient(o.auth.IdentityEndpoint); err != nil {\n- return errors.Wrap(err, \"Creating Gophercloud ProviderClient failed.\")\n+ return errors.Wrap(err, \"Creating Gophercloud ProviderClient failed\")\n}\nif o.identity, err = openstack.NewIdentityV3(o.provider, gophercloud.EndpointOpts{}); err != nil {\n- return errors.Wrap(err, \"Creating Identity ServiceClient failed.\")\n+ return errors.Wrap(err, \"Creating Identity ServiceClient failed\")\n}\nreturn nil\n@@ -207,8 +207,15 @@ func (o *CredentialsOptions) fetchCredentials() (string, error) {\nreturn nil\n}))\n- if err != nil {\n- return \"\", errors.Wrap(err, \"Couldn't fetch credentials from Kubernikus API\")\n+ switch err.(type) {\n+ case *operations.GetClusterCredentialsDefault:\n+ result := err.(*operations.GetClusterCredentialsDefault)\n+ if result.Code() == 404 {\n+ return \"\", errors.Errorf(\"Cluster %v not found\", o.name)\n+ }\n+ return \"\", errors.Errorf(*result.Payload.Message)\n+ case error:\n+ return \"\", errors.Wrapf(err, \"A generic error occured\")\n}\nreturn ok.Payload.Kubeconfig, nil\n@@ -223,6 +230,14 @@ func (o *CredentialsOptions) autoDetectClusterName() (string, error) {\nreturn nil\n}))\n+ switch err.(type) {\n+ case *operations.ListClustersDefault:\n+ result := err.(*operations.ListClustersDefault)\n+ return \"\", errors.Errorf(*result.Payload.Message)\n+ case error:\n+ return \"\", errors.Wrapf(err, \"Listing clusters failed\")\n+ }\n+\nif err != nil {\nreturn \"\", errors.Wrap(err, \"Couldn't fetch kluster list from Kubernikus API\")\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | improves(?) error handling |
596,240 | 06.10.2017 14:48:23 | -7,200 | 9cfb30ead997c4c0c4864731165fad4c844f23d5 | updates mergo dep | [
{
"change_type": "MODIFY",
"old_path": "glide.lock",
"new_path": "glide.lock",
"diff": "-hash: 9fc2e6d19dccc68bd0515f007ed08b7c62db6d97b3afa023a682d2cdb0f5894a\n-updated: 2017-10-05T20:49:23.056605826+02:00\n+hash: d327734e6344b5208776ce68d5a1a41d4a2b90bd78ff69896d8294b0a2c578f6\n+updated: 2017-10-06T14:43:04.735885533+02:00\nimports:\n- name: github.com/ajeddeloh/yaml\nversion: 1072abfea31191db507785e2e0c1b8d1440d35a5\n@@ -154,7 +154,7 @@ imports:\n- name: github.com/huandu/xstrings\nversion: d6590c0c31d16526217fa60fbd2067f7afcd78c5\n- name: github.com/imdario/mergo\n- version: 6633656539c1639d9d78127b7d47c622b5d7b6dc\n+ version: 3e95a51e0639b4cf372f2ccf74c86749d747fbdc\n- name: github.com/inconshreveable/mousetrap\nversion: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75\n- name: github.com/juju/ratelimit\n"
},
{
"change_type": "MODIFY",
"old_path": "glide.yaml",
"new_path": "glide.yaml",
"diff": "@@ -29,4 +29,5 @@ import:\nversion: v0.4.2\n- package: github.com/pkg/errors\nversion: 0.8.0\n-\n+- package: github.com/imdario/mergo\n+ version: 0.2.2\n"
},
{
"change_type": "MODIFY",
"old_path": "vendor/github.com/imdario/mergo/README.md",
"new_path": "vendor/github.com/imdario/mergo/README.md",
"diff": "@@ -8,8 +8,31 @@ Also a lovely [comune](http://en.wikipedia.org/wiki/Mergo) (municipality) in the\n## Status\n-It is ready for production use. It works fine although it may use more of testing. Here some projects in the wild using Mergo:\n+It is ready for production use. It works fine after extensive use in the wild.\n+[![Build Status][1]][2]\n+[![GoDoc][3]][4]\n+[![GoCard][5]][6]\n+\n+[1]: https://travis-ci.org/imdario/mergo.png\n+[2]: https://travis-ci.org/imdario/mergo\n+[3]: https://godoc.org/github.com/imdario/mergo?status.svg\n+[4]: https://godoc.org/github.com/imdario/mergo\n+[5]: https://goreportcard.com/badge/imdario/mergo\n+[6]: https://goreportcard.com/report/github.com/imdario/mergo\n+\n+### Important note\n+\n+Mergo is intended to assign **only** zero value fields on destination with source value. Since April 6th it works like this. Before it didn't work properly, causing some random overwrites. After some issues and PRs I found it didn't merge as I designed it. Thanks to [imdario/mergo#8](https://github.com/imdario/mergo/pull/8) overwriting functions were added and the wrong behavior was clearly detected.\n+\n+If you were using Mergo **before** April 6th 2015, please check your project works as intended after updating your local copy with ```go get -u github.com/imdario/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause (I hope it won't!) in existing projects after the change (release 0.2.0).\n+\n+### Mergo in the wild\n+\n+- [docker/docker](https://github.com/docker/docker/)\n+- [GoogleCloudPlatform/kubernetes](https://github.com/GoogleCloudPlatform/kubernetes)\n+- [imdario/zas](https://github.com/imdario/zas)\n+- [soniah/dnsmadeeasy](https://github.com/soniah/dnsmadeeasy)\n- [EagerIO/Stout](https://github.com/EagerIO/Stout)\n- [lynndylanhurley/defsynth-api](https://github.com/lynndylanhurley/defsynth-api)\n- [russross/canvasassignments](https://github.com/russross/canvasassignments)\n@@ -17,12 +40,16 @@ It is ready for production use. It works fine although it may use more of testin\n- [casualjim/exeggutor](https://github.com/casualjim/exeggutor)\n- [divshot/gitling](https://github.com/divshot/gitling)\n- [RWJMurphy/gorl](https://github.com/RWJMurphy/gorl)\n-\n-[![Build Status][1]][2]\n-[](https://godoc.org/github.com/imdario/mergo)\n-\n-[1]: https://travis-ci.org/imdario/mergo.png\n-[2]: https://travis-ci.org/imdario/mergo\n+- [andrerocker/deploy42](https://github.com/andrerocker/deploy42)\n+- [elwinar/rambler](https://github.com/elwinar/rambler)\n+- [tmaiaroto/gopartman](https://github.com/tmaiaroto/gopartman)\n+- [jfbus/impressionist](https://github.com/jfbus/impressionist)\n+- [Jmeyering/zealot](https://github.com/Jmeyering/zealot)\n+- [godep-migrator/rigger-host](https://github.com/godep-migrator/rigger-host)\n+- [Dronevery/MultiwaySwitch-Go](https://github.com/Dronevery/MultiwaySwitch-Go)\n+- [thoas/picfit](https://github.com/thoas/picfit)\n+- [mantasmatelis/whooplist-server](https://github.com/mantasmatelis/whooplist-server)\n+- [jnuthong/item_search](https://github.com/jnuthong/item_search)\n## Installation\n@@ -51,6 +78,39 @@ Warning: if you map a struct to map, it won't do it recursively. Don't expect Me\nMore information and examples in [godoc documentation](http://godoc.org/github.com/imdario/mergo).\n+### Nice example\n+\n+```go\n+package main\n+\n+import (\n+ \"fmt\"\n+ \"github.com/imdario/mergo\"\n+)\n+\n+type Foo struct {\n+ A string\n+ B int64\n+}\n+\n+func main() {\n+ src := Foo{\n+ A: \"one\",\n+ }\n+\n+ dest := Foo{\n+ A: \"two\",\n+ B: 2,\n+ }\n+\n+ mergo.Merge(&dest, src)\n+\n+ fmt.Println(dest)\n+ // Will print\n+ // {two 2}\n+}\n+```\n+\nNote: if test are failing due missing package, please execute:\ngo get gopkg.in/yaml.v1\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "vendor/github.com/imdario/mergo/issue17_test.go",
"diff": "+package mergo\n+\n+import (\n+ \"encoding/json\"\n+ \"testing\"\n+)\n+\n+var (\n+ request = `{\"timestamp\":null, \"name\": \"foo\"}`\n+ maprequest = map[string]interface{}{\n+ \"timestamp\": nil,\n+ \"name\": \"foo\",\n+ \"newStuff\": \"foo\",\n+ }\n+)\n+\n+func TestIssue17MergeWithOverwrite(t *testing.T) {\n+ var something map[string]interface{}\n+ if err := json.Unmarshal([]byte(request), &something); err != nil {\n+ t.Errorf(\"Error while Unmarshalling maprequest %s\", err)\n+ }\n+ if err := MergeWithOverwrite(&something, maprequest); err != nil {\n+ t.Errorf(\"Error while merging %s\", err)\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "vendor/github.com/imdario/mergo/map.go",
"new_path": "vendor/github.com/imdario/mergo/map.go",
"diff": "@@ -31,7 +31,7 @@ func isExported(field reflect.StructField) bool {\n// Traverses recursively both values, assigning src's fields values to dst.\n// The map argument tracks comparisons that have already been seen, which allows\n// short circuiting on recursive types.\n-func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err error) {\n+func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, overwrite bool) (err error) {\nif dst.CanAddr() {\naddr := dst.UnsafeAddr()\nh := 17 * addr\n@@ -57,7 +57,7 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err\n}\nfieldName := field.Name\nfieldName = changeInitialCase(fieldName, unicode.ToLower)\n- if v, ok := dstMap[fieldName]; !ok || isEmptyValue(reflect.ValueOf(v)) {\n+ if v, ok := dstMap[fieldName]; !ok || (isEmptyValue(reflect.ValueOf(v)) || overwrite) {\ndstMap[fieldName] = src.Field(i).Interface()\n}\n}\n@@ -89,12 +89,12 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err\ncontinue\n}\nif srcKind == dstKind {\n- if err = deepMerge(dstElement, srcElement, visited, depth+1); err != nil {\n+ if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {\nreturn\n}\n} else {\nif srcKind == reflect.Map {\n- if err = deepMap(dstElement, srcElement, visited, depth+1); err != nil {\n+ if err = deepMap(dstElement, srcElement, visited, depth+1, overwrite); err != nil {\nreturn\n}\n} else {\n@@ -118,6 +118,16 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err\n// This is separated method from Merge because it is cleaner and it keeps sane\n// semantics: merging equal types, mapping different (restricted) types.\nfunc Map(dst, src interface{}) error {\n+ return _map(dst, src, false)\n+}\n+\n+// MapWithOverwrite will do the same as Map except that non-empty dst attributes will be overriden by\n+// non-empty src attribute values.\n+func MapWithOverwrite(dst, src interface{}) error {\n+ return _map(dst, src, true)\n+}\n+\n+func _map(dst, src interface{}, overwrite bool) error {\nvar (\nvDst, vSrc reflect.Value\nerr error\n@@ -128,7 +138,7 @@ func Map(dst, src interface{}) error {\n// To be friction-less, we redirect equal-type arguments\n// to deepMerge. Only because arguments can be anything.\nif vSrc.Kind() == vDst.Kind() {\n- return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0)\n+ return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)\n}\nswitch vSrc.Kind() {\ncase reflect.Struct:\n@@ -142,5 +152,5 @@ func Map(dst, src interface{}) error {\ndefault:\nreturn ErrNotSupported\n}\n- return deepMap(vDst, vSrc, make(map[uintptr]*visit), 0)\n+ return deepMap(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "vendor/github.com/imdario/mergo/merge.go",
"new_path": "vendor/github.com/imdario/mergo/merge.go",
"diff": "@@ -15,7 +15,7 @@ import (\n// Traverses recursively both values, assigning src's fields values to dst.\n// The map argument tracks comparisons that have already been seen, which allows\n// short circuiting on recursive types.\n-func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (err error) {\n+func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, overwrite bool) (err error) {\nif !src.IsValid() {\nreturn\n}\n@@ -35,7 +35,7 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (e\nswitch dst.Kind() {\ncase reflect.Struct:\nfor i, n := 0, dst.NumField(); i < n; i++ {\n- if err = deepMerge(dst.Field(i), src.Field(i), visited, depth+1); err != nil {\n+ if err = deepMerge(dst.Field(i), src.Field(i), visited, depth+1, overwrite); err != nil {\nreturn\n}\n}\n@@ -46,15 +46,31 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (e\ncontinue\n}\ndstElement := dst.MapIndex(key)\n+ switch srcElement.Kind() {\n+ case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Interface, reflect.Slice:\n+ if srcElement.IsNil() {\n+ continue\n+ }\n+ fallthrough\n+ default:\n+ if !srcElement.CanInterface() {\n+ continue\n+ }\nswitch reflect.TypeOf(srcElement.Interface()).Kind() {\ncase reflect.Struct:\nfallthrough\n+ case reflect.Ptr:\n+ fallthrough\ncase reflect.Map:\n- if err = deepMerge(dstElement, srcElement, visited, depth+1); err != nil {\n+ if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {\nreturn\n}\n}\n- if !dstElement.IsValid() {\n+ }\n+ if !isEmptyValue(srcElement) && (overwrite || (!dstElement.IsValid() || isEmptyValue(dst))) {\n+ if dst.IsNil() {\n+ dst.Set(reflect.MakeMap(dst.Type()))\n+ }\ndst.SetMapIndex(key, srcElement)\n}\n}\n@@ -64,27 +80,35 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int) (e\nif src.IsNil() {\nbreak\n} else if dst.IsNil() {\n- if dst.CanSet() && isEmptyValue(dst) {\n+ if dst.CanSet() && (overwrite || isEmptyValue(dst)) {\ndst.Set(src)\n}\n- } else if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1); err != nil {\n+ } else if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, overwrite); err != nil {\nreturn\n}\ndefault:\n- if dst.CanSet() && !isEmptyValue(src) {\n+ if dst.CanSet() && !isEmptyValue(src) && (overwrite || isEmptyValue(dst)) {\ndst.Set(src)\n}\n}\nreturn\n}\n-// Merge sets fields' values in dst from src if they have a zero\n-// value of their type.\n-// dst and src must be valid same-type structs and dst must be\n-// a pointer to struct.\n-// It won't merge unexported (private) fields and will do recursively\n-// any exported field.\n+// Merge will fill any empty for value type attributes on the dst struct using corresponding\n+// src attributes if they themselves are not empty. dst and src must be valid same-type structs\n+// and dst must be a pointer to struct.\n+// It won't merge unexported (private) fields and will do recursively any exported field.\nfunc Merge(dst, src interface{}) error {\n+ return merge(dst, src, false)\n+}\n+\n+// MergeWithOverwrite will do the same as Merge except that non-empty dst attributes will be overriden by\n+// non-empty src attribute values.\n+func MergeWithOverwrite(dst, src interface{}) error {\n+ return merge(dst, src, true)\n+}\n+\n+func merge(dst, src interface{}, overwrite bool) error {\nvar (\nvDst, vSrc reflect.Value\nerr error\n@@ -95,5 +119,5 @@ func Merge(dst, src interface{}) error {\nif vDst.Type() != vSrc.Type() {\nreturn ErrDifferentArgumentsTypes\n}\n- return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0)\n+ return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, overwrite)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "vendor/github.com/imdario/mergo/mergo_test.go",
"new_path": "vendor/github.com/imdario/mergo/mergo_test.go",
"diff": "package mergo\nimport (\n- \"gopkg.in/yaml.v1\"\n\"io/ioutil\"\n\"reflect\"\n\"testing\"\n+ \"time\"\n+\n+ \"gopkg.in/yaml.v1\"\n)\ntype simpleTest struct {\n@@ -19,7 +21,7 @@ type simpleTest struct {\ntype complexTest struct {\nSt simpleTest\nsz int\n- Id string\n+ ID string\n}\ntype moreComplextText struct {\n@@ -36,6 +38,41 @@ type sliceTest struct {\nS []int\n}\n+func TestKb(t *testing.T) {\n+ type testStruct struct {\n+ Name string\n+ KeyValue map[string]interface{}\n+ }\n+\n+ akv := make(map[string]interface{})\n+ akv[\"Key1\"] = \"not value 1\"\n+ akv[\"Key2\"] = \"value2\"\n+ a := testStruct{}\n+ a.Name = \"A\"\n+ a.KeyValue = akv\n+\n+ bkv := make(map[string]interface{})\n+ bkv[\"Key1\"] = \"value1\"\n+ bkv[\"Key3\"] = \"value3\"\n+ b := testStruct{}\n+ b.Name = \"B\"\n+ b.KeyValue = bkv\n+\n+ ekv := make(map[string]interface{})\n+ ekv[\"Key1\"] = \"value1\"\n+ ekv[\"Key2\"] = \"value2\"\n+ ekv[\"Key3\"] = \"value3\"\n+ expected := testStruct{}\n+ expected.Name = \"B\"\n+ expected.KeyValue = ekv\n+\n+ Merge(&b, a)\n+\n+ if !reflect.DeepEqual(b, expected) {\n+ t.Errorf(\"Actual: %#v did not match \\nExpected: %#v\", b, expected)\n+ }\n+}\n+\nfunc TestNil(t *testing.T) {\nif err := Merge(nil, nil); err != ErrNilArguments {\nt.Fail()\n@@ -57,7 +94,7 @@ func TestSimpleStruct(t *testing.T) {\nt.FailNow()\n}\nif a.Value != 42 {\n- t.Fatalf(\"b not merged in a properly: a.Value(%d) != b.Value(%d)\", a.Value, b.Value)\n+ t.Fatalf(\"b not merged in properly: a.Value(%d) != b.Value(%d)\", a.Value, b.Value)\n}\nif !reflect.DeepEqual(a, b) {\nt.FailNow()\n@@ -66,19 +103,33 @@ func TestSimpleStruct(t *testing.T) {\nfunc TestComplexStruct(t *testing.T) {\na := complexTest{}\n- a.Id = \"athing\"\n+ a.ID = \"athing\"\nb := complexTest{simpleTest{42}, 1, \"bthing\"}\nif err := Merge(&a, b); err != nil {\nt.FailNow()\n}\nif a.St.Value != 42 {\n- t.Fatalf(\"b not merged in a properly: a.St.Value(%d) != b.St.Value(%d)\", a.St.Value, b.St.Value)\n+ t.Fatalf(\"b not merged in properly: a.St.Value(%d) != b.St.Value(%d)\", a.St.Value, b.St.Value)\n}\nif a.sz == 1 {\nt.Fatalf(\"a's private field sz not preserved from merge: a.sz(%d) == b.sz(%d)\", a.sz, b.sz)\n}\n- if a.Id != b.Id {\n- t.Fatalf(\"a's field Id not merged properly: a.Id(%s) != b.Id(%s)\", a.Id, b.Id)\n+ if a.ID == b.ID {\n+ t.Fatalf(\"a's field ID merged unexpectedly: a.ID(%s) == b.ID(%s)\", a.ID, b.ID)\n+ }\n+}\n+\n+func TestComplexStructWithOverwrite(t *testing.T) {\n+ a := complexTest{simpleTest{1}, 1, \"do-not-overwrite-with-empty-value\"}\n+ b := complexTest{simpleTest{42}, 2, \"\"}\n+\n+ expect := complexTest{simpleTest{42}, 1, \"do-not-overwrite-with-empty-value\"}\n+ if err := MergeWithOverwrite(&a, b); err != nil {\n+ t.FailNow()\n+ }\n+\n+ if !reflect.DeepEqual(a, expect) {\n+ t.Fatalf(\"Test failed:\\ngot :\\n%#v\\n\\nwant :\\n%#v\\n\\n\", a, expect)\n}\n}\n@@ -91,7 +142,68 @@ func TestPointerStruct(t *testing.T) {\nt.FailNow()\n}\nif a.C.Value != b.C.Value {\n- //t.Fatalf(\"b not merged in a properly: a.C.Value(%d) != b.C.Value(%d)\", a.C.Value, b.C.Value)\n+ t.Fatalf(\"b not merged in properly: a.C.Value(%d) != b.C.Value(%d)\", a.C.Value, b.C.Value)\n+ }\n+}\n+\n+type embeddingStruct struct {\n+ embeddedStruct\n+}\n+\n+type embeddedStruct struct {\n+ A string\n+}\n+\n+func TestEmbeddedStruct(t *testing.T) {\n+ tests := []struct {\n+ src embeddingStruct\n+ dst embeddingStruct\n+ expected embeddingStruct\n+ }{\n+ {\n+ src: embeddingStruct{\n+ embeddedStruct{\"foo\"},\n+ },\n+ dst: embeddingStruct{\n+ embeddedStruct{\"\"},\n+ },\n+ expected: embeddingStruct{\n+ embeddedStruct{\"foo\"},\n+ },\n+ },\n+ {\n+ src: embeddingStruct{\n+ embeddedStruct{\"\"},\n+ },\n+ dst: embeddingStruct{\n+ embeddedStruct{\"bar\"},\n+ },\n+ expected: embeddingStruct{\n+ embeddedStruct{\"bar\"},\n+ },\n+ },\n+ {\n+ src: embeddingStruct{\n+ embeddedStruct{\"foo\"},\n+ },\n+ dst: embeddingStruct{\n+ embeddedStruct{\"bar\"},\n+ },\n+ expected: embeddingStruct{\n+ embeddedStruct{\"bar\"},\n+ },\n+ },\n+ }\n+\n+ for _, test := range tests {\n+ err := Merge(&test.dst, test.src)\n+ if err != nil {\n+ t.Errorf(\"unexpected error: %v\", err)\n+ continue\n+ }\n+ if !reflect.DeepEqual(test.dst, test.expected) {\n+ t.Errorf(\"unexpected output\\nexpected:\\n%+v\\nsaw:\\n%+v\\n\", test.expected, test.dst)\n+ }\n}\n}\n@@ -116,7 +228,7 @@ func TestSliceStruct(t *testing.T) {\nt.FailNow()\n}\nif len(a.S) != len(b.S) {\n- t.Fatalf(\"b not merged in a properly %d != %d\", len(a.S), len(b.S))\n+ t.Fatalf(\"b not merged in a proper way %d != %d\", len(a.S), len(b.S))\n}\na = sliceTest{[]int{1}}\n@@ -124,29 +236,71 @@ func TestSliceStruct(t *testing.T) {\nif err := Merge(&a, b); err != nil {\nt.FailNow()\n}\n- if len(b.S) != 3 {\n+ if len(a.S) != 1 {\nt.FailNow()\n}\n- if len(a.S) != len(b.S) {\n- t.Fatalf(\"b not merged in a properly %d != %d\", len(a.S), len(b.S))\n+ if len(a.S) == len(b.S) {\n+ t.Fatalf(\"b merged unexpectedly %d != %d\", len(a.S), len(b.S))\n+ }\n+}\n+\n+func TestMapsWithOverwrite(t *testing.T) {\n+ m := map[string]simpleTest{\n+ \"a\": {}, // overwritten by 16\n+ \"b\": {42}, // not overwritten by empty value\n+ \"c\": {13}, // overwritten by 12\n+ \"d\": {61},\n+ }\n+ n := map[string]simpleTest{\n+ \"a\": {16},\n+ \"b\": {},\n+ \"c\": {12},\n+ \"e\": {14},\n+ }\n+ expect := map[string]simpleTest{\n+ \"a\": {16},\n+ \"b\": {},\n+ \"c\": {12},\n+ \"d\": {61},\n+ \"e\": {14},\n+ }\n+\n+ if err := MergeWithOverwrite(&m, n); err != nil {\n+ t.Fatalf(err.Error())\n+ }\n+\n+ if !reflect.DeepEqual(m, expect) {\n+ t.Fatalf(\"Test failed:\\ngot :\\n%#v\\n\\nwant :\\n%#v\\n\\n\", m, expect)\n}\n}\nfunc TestMaps(t *testing.T) {\nm := map[string]simpleTest{\n- \"a\": simpleTest{},\n- \"b\": simpleTest{42},\n+ \"a\": {},\n+ \"b\": {42},\n+ \"c\": {13},\n+ \"d\": {61},\n}\nn := map[string]simpleTest{\n- \"a\": simpleTest{16},\n- \"b\": simpleTest{},\n- \"c\": simpleTest{12},\n+ \"a\": {16},\n+ \"b\": {},\n+ \"c\": {12},\n+ \"e\": {14},\n+ }\n+ expect := map[string]simpleTest{\n+ \"a\": {0},\n+ \"b\": {42},\n+ \"c\": {13},\n+ \"d\": {61},\n+ \"e\": {14},\n}\n+\nif err := Merge(&m, n); err != nil {\nt.Fatalf(err.Error())\n}\n- if len(m) != 3 {\n- t.Fatalf(`n not merged in m properly, m must have 3 elements instead of %d`, len(m))\n+\n+ if !reflect.DeepEqual(m, expect) {\n+ t.Fatalf(\"Test failed:\\ngot :\\n%#v\\n\\nwant :\\n%#v\\n\\n\", m, expect)\n}\nif m[\"a\"].Value != 0 {\nt.Fatalf(`n merged in m because I solved non-addressable map values TODO: m[\"a\"].Value(%d) != n[\"a\"].Value(%d)`, m[\"a\"].Value, n[\"a\"].Value)\n@@ -154,8 +308,8 @@ func TestMaps(t *testing.T) {\nif m[\"b\"].Value != 42 {\nt.Fatalf(`n wrongly merged in m: m[\"b\"].Value(%d) != n[\"b\"].Value(%d)`, m[\"b\"].Value, n[\"b\"].Value)\n}\n- if m[\"c\"].Value != 12 {\n- t.Fatalf(`n not merged in m: m[\"c\"].Value(%d) != n[\"c\"].Value(%d)`, m[\"c\"].Value, n[\"c\"].Value)\n+ if m[\"c\"].Value != 13 {\n+ t.Fatalf(`n overwritten in m: m[\"c\"].Value(%d) != n[\"c\"].Value(%d)`, m[\"c\"].Value, n[\"c\"].Value)\n}\n}\n@@ -188,7 +342,7 @@ func TestTwoPointerValues(t *testing.T) {\nfunc TestMap(t *testing.T) {\na := complexTest{}\n- a.Id = \"athing\"\n+ a.ID = \"athing\"\nc := moreComplextText{a, simpleTest{}, simpleTest{}}\nb := map[string]interface{}{\n\"ct\": map[string]interface{}{\n@@ -210,19 +364,19 @@ func TestMap(t *testing.T) {\no := b[\"st\"].(*simpleTest)\np := b[\"nt\"].(simpleTest)\nif c.Ct.St.Value != 42 {\n- t.Fatalf(\"b not merged in a properly: c.Ct.St.Value(%d) != b.Ct.St.Value(%d)\", c.Ct.St.Value, n[\"value\"])\n+ t.Fatalf(\"b not merged in properly: c.Ct.St.Value(%d) != b.Ct.St.Value(%d)\", c.Ct.St.Value, n[\"value\"])\n}\nif c.St.Value != 144 {\n- t.Fatalf(\"b not merged in a properly: c.St.Value(%d) != b.St.Value(%d)\", c.St.Value, o.Value)\n+ t.Fatalf(\"b not merged in properly: c.St.Value(%d) != b.St.Value(%d)\", c.St.Value, o.Value)\n}\nif c.Nt.Value != 3 {\n- t.Fatalf(\"b not merged in a properly: c.Nt.Value(%d) != b.Nt.Value(%d)\", c.St.Value, p.Value)\n+ t.Fatalf(\"b not merged in properly: c.Nt.Value(%d) != b.Nt.Value(%d)\", c.St.Value, p.Value)\n}\nif c.Ct.sz == 1 {\nt.Fatalf(\"a's private field sz not preserved from merge: c.Ct.sz(%d) == b.Ct.sz(%d)\", c.Ct.sz, m[\"sz\"])\n}\n- if c.Ct.Id != m[\"id\"] {\n- t.Fatalf(\"a's field Id not merged properly: c.Ct.Id(%s) != b.Ct.Id(%s)\", c.Ct.Id, m[\"id\"])\n+ if c.Ct.ID == m[\"id\"] {\n+ t.Fatalf(\"a's field ID merged unexpectedly: c.Ct.ID(%s) == b.Ct.ID(%s)\", c.Ct.ID, m[\"id\"])\n}\n}\n@@ -235,7 +389,7 @@ func TestSimpleMap(t *testing.T) {\nt.FailNow()\n}\nif a.Value != 42 {\n- t.Fatalf(\"b not merged in a properly: a.Value(%d) != b.Value(%v)\", a.Value, b[\"value\"])\n+ t.Fatalf(\"b not merged in properly: a.Value(%d) != b.Value(%v)\", a.Value, b[\"value\"])\n}\n}\n@@ -256,10 +410,10 @@ func TestBackAndForth(t *testing.T) {\nok bool\n)\nif v, ok = m[\"a\"]; v.(int) != pt.A || !ok {\n- t.Fatalf(\"pt not merged properly: m[`a`](%d) != pt.A(%d)\", v, pt.A)\n+ t.Fatalf(\"pt not merged in properly: m[`a`](%d) != pt.A(%d)\", v, pt.A)\n}\nif v, ok = m[\"b\"]; !ok {\n- t.Fatalf(\"pt not merged properly: B is missing in m\")\n+ t.Fatalf(\"pt not merged in properly: B is missing in m\")\n}\nvar st *simpleTest\nif st = v.(*simpleTest); st.Value != 66 {\n@@ -270,13 +424,73 @@ func TestBackAndForth(t *testing.T) {\nt.Fatal(err)\n}\nif bpt.A != pt.A {\n- t.Fatalf(\"pt not merged properly: bpt.A(%d) != pt.A(%d)\", bpt.A, pt.A)\n+ t.Fatalf(\"pt not merged in properly: bpt.A(%d) != pt.A(%d)\", bpt.A, pt.A)\n}\nif bpt.hidden == pt.hidden {\nt.Fatalf(\"pt unexpectedly merged: bpt.hidden(%d) == pt.hidden(%d)\", bpt.hidden, pt.hidden)\n}\nif bpt.B.Value != pt.B.Value {\n- t.Fatalf(\"pt not merged properly: bpt.B.Value(%d) != pt.B.Value(%d)\", bpt.B.Value, pt.B.Value)\n+ t.Fatalf(\"pt not merged in properly: bpt.B.Value(%d) != pt.B.Value(%d)\", bpt.B.Value, pt.B.Value)\n+ }\n+}\n+\n+type structWithTimePointer struct {\n+ Birth *time.Time\n+}\n+\n+func TestTime(t *testing.T) {\n+ now := time.Now()\n+ dataStruct := structWithTimePointer{\n+ Birth: &now,\n+ }\n+ dataMap := map[string]interface{}{\n+ \"Birth\": &now,\n+ }\n+ b := structWithTimePointer{}\n+ if err := Merge(&b, dataStruct); err != nil {\n+ t.FailNow()\n+ }\n+ if b.Birth.IsZero() {\n+ t.Fatalf(\"time.Time not merged in properly: b.Birth(%v) != dataStruct['Birth'](%v)\", b.Birth, dataStruct.Birth)\n+ }\n+ if b.Birth != dataStruct.Birth {\n+ t.Fatalf(\"time.Time not merged in properly: b.Birth(%v) != dataStruct['Birth'](%v)\", b.Birth, dataStruct.Birth)\n+ }\n+ b = structWithTimePointer{}\n+ if err := Map(&b, dataMap); err != nil {\n+ t.FailNow()\n+ }\n+ if b.Birth.IsZero() {\n+ t.Fatalf(\"time.Time not merged in properly: b.Birth(%v) != dataMap['Birth'](%v)\", b.Birth, dataMap[\"Birth\"])\n+ }\n+}\n+\n+type simpleNested struct {\n+ A int\n+}\n+\n+type structWithNestedPtrValueMap struct {\n+ NestedPtrValue map[string]*simpleNested\n+}\n+\n+func TestNestedPtrValueInMap(t *testing.T) {\n+ src := &structWithNestedPtrValueMap{\n+ NestedPtrValue: map[string]*simpleNested{\n+ \"x\": {\n+ A: 1,\n+ },\n+ },\n+ }\n+ dst := &structWithNestedPtrValueMap{\n+ NestedPtrValue: map[string]*simpleNested{\n+ \"x\": {},\n+ },\n+ }\n+ if err := Map(dst, src); err != nil {\n+ t.FailNow()\n+ }\n+ if dst.NestedPtrValue[\"x\"].A == 0 {\n+ t.Fatalf(\"Nested Ptr value not merged in properly: dst.NestedPtrValue[\\\"x\\\"].A(%v) != src.NestedPtrValue[\\\"x\\\"].A(%v)\", dst.NestedPtrValue[\"x\"].A, src.NestedPtrValue[\"x\"].A)\n}\n}\n@@ -286,3 +500,26 @@ func loadYAML(path string) (m map[string]interface{}) {\n_ = yaml.Unmarshal(raw, &m)\nreturn\n}\n+\n+type structWithMap struct {\n+ m map[string]structWithUnexportedProperty\n+}\n+\n+type structWithUnexportedProperty struct {\n+ s string\n+}\n+\n+func TestUnexportedProperty(t *testing.T) {\n+ a := structWithMap{map[string]structWithUnexportedProperty{\n+ \"key\": structWithUnexportedProperty{\"hello\"},\n+ }}\n+ b := structWithMap{map[string]structWithUnexportedProperty{\n+ \"key\": structWithUnexportedProperty{\"hi\"},\n+ }}\n+ defer func() {\n+ if r := recover(); r != nil {\n+ t.Errorf(\"Should not have panicked\")\n+ }\n+ }()\n+ Merge(&a, b)\n+}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | updates mergo dep |
596,240 | 06.10.2017 14:48:47 | -7,200 | 854a7f6d7b40239419a32683930572482736d114 | merges with overwrite | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -265,7 +265,7 @@ func (o *CredentialsOptions) mergeAndPersist(rawConfig string) error {\nreturn errors.Wrapf(err, \"Couldn't load kubernikus kubeconfig: %v\", rawConfig)\n}\n- if err := mergo.Merge(startingConfig, config); err != nil {\n+ if err := mergo.MergeWithOverwrite(startingConfig, config); err != nil {\nreturn errors.Wrap(err, \"Couldn't merge kubeconfigs\")\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | merges with overwrite |
596,240 | 06.10.2017 20:08:56 | -7,200 | cb000bf5ce2d0768391407c9a2defce13aa09314 | retrieve kubernikus url from servie catalog | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -2,6 +2,7 @@ package kubernikusctl\nimport (\n\"fmt\"\n+ \"net/url\"\n\"os\"\n\"github.com/go-openapi/runtime\"\n@@ -39,7 +40,7 @@ func NewCredentialsCommand() *cobra.Command {\n}\ntype CredentialsOptions struct {\n- host string\n+ url string\nname string\nkubernikus *kubernikus.Kubernikus\n@@ -77,7 +78,7 @@ func (o *CredentialsOptions) BindFlags(flags *pflag.FlagSet) {\nflags.StringVar(&o.auth.DomainName, \"user-domain-name\", o.auth.DomainName, \"User domain [OS_USER_DOMAIN_NAME]\")\nflags.StringVar(&o.auth.Scope.ProjectName, \"project-name\", o.auth.Scope.ProjectName, \"Scope to this project [OS_PROJECT_NAME]\")\nflags.StringVar(&o.auth.Scope.DomainName, \"project-domain-name\", o.auth.Scope.DomainName, \"Domain of the project [OS_PROJECT_DOMAIN_NAME]\")\n- flags.StringVar(&o.host, \"host\", o.host, \"Kubernikus API host name\")\n+ flags.StringVar(&o.url, \"url\", o.url, \"URL for Kubernikus API\")\n}\nfunc (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\n@@ -122,15 +123,24 @@ func (o *CredentialsOptions) Complete(args []string) error {\nreturn errors.Errorf(\"Authentication failed\")\n}\n- if o.host == \"\" {\n+ if o.url == \"\" {\nfmt.Println(\"Auto-Detectng Kubernikus Host...\")\n- if o.host, err = o.autoDetectKubernikusHost(); err != nil {\n+ if o.url, err = o.autoDetectKubernikusHost(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"You need to provide --host. Auto-Detection failed\")\n+ return errors.Errorf(\"You need to provide --url. Auto-Detection failed\")\n}\n}\n- transport := kubernikus.DefaultTransportConfig().WithSchemes([]string{\"https\"}).WithHost(o.host)\n+ url, err := url.Parse(o.url)\n+ if err != nil {\n+ glog.V(2).Infof(\"%#v\", err)\n+ return errors.Errorf(\"The URL for the Kubernikus API is not parsable\")\n+ }\n+\n+ transport := kubernikus.DefaultTransportConfig().\n+ WithSchemes([]string{url.Scheme}).\n+ WithHost(url.Hostname()).\n+ WithBasePath(url.EscapedPath())\no.kubernikus = kubernikus.NewHTTPClientWithConfig(nil, transport)\nif len(args) == 1 {\n@@ -149,7 +159,7 @@ func (o *CredentialsOptions) Complete(args []string) error {\n}\nfunc (o *CredentialsOptions) Run(c *cobra.Command) error {\n- fmt.Printf(\"Fetching credentials for %v/%v/%v from %v\\n\", o.auth.Scope.DomainName, o.auth.Scope.ProjectName, o.name, o.host)\n+ fmt.Printf(\"Fetching credentials for %v/%v/%v from %v\\n\", o.auth.Scope.DomainName, o.auth.Scope.ProjectName, o.name, o.url)\nkubeconfig, err := o.fetchCredentials()\nif err != nil {\nglog.V(2).Infof(\"%+v\", err)\n@@ -195,7 +205,17 @@ func (o *CredentialsOptions) autoDetectKubernikusHost() (string, error) {\nreturn \"\", errors.Wrap(err, \"Couldn't fetch service catalog\")\n}\n- return fmt.Sprintf(\"kubernikus.%v.cloud.sap\", catalog.Entries[0].Endpoints[0].Region), nil\n+ for _, service := range catalog.Entries {\n+ if service.Type == \"kubernikus\" {\n+ for _, endpoint := range service.Endpoints {\n+ if endpoint.Interface == \"public\" {\n+ return endpoint.URL, nil\n+ }\n+ }\n+ }\n+ }\n+\n+ return \"\", errors.Errorf(\"No public Kubernikus service found in the service catalog\")\n}\nfunc (o *CredentialsOptions) fetchCredentials() (string, error) {\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | retrieve kubernikus url from servie catalog |
596,240 | 06.10.2017 21:37:43 | -7,200 | 0f05b7857f5226177b636dff695ebcd0a63d3499 | build multiple images | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "Dockerfile.binaries",
"diff": "+FROM golang:1.9.0-alpine3.6 as builder\n+WORKDIR /go/src/github.com/sapcc/kubernikus/\n+RUN apk add --no-cache make\n+COPY . .\n+ARG VERSION\n+RUN make all\n+\n+FROM scratch\n+COPY --from=builder /go/src/github.com/sapcc/kubernikus/bin/linux/* /\n"
},
{
"change_type": "RENAME",
"old_path": "Dockerfile",
"new_path": "Dockerfile.kubernikus",
"diff": "-FROM golang:1.9.0-alpine3.6 as builder\n-WORKDIR /go/src/github.com/sapcc/kubernikus/\n-RUN apk add --no-cache make\n-COPY . .\n-ARG VERSION\n-RUN make all\n+ARG VERSION=latest\n+FROM sapcc/binaries:$VERSION as binaries\nFROM alpine:3.6\nMAINTAINER \"Fabian Ruff <fabian.ruff@sap.com>\"\n@@ -12,6 +8,6 @@ RUN curl -Lo /bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/\n&& chmod +x /bin/dumb-init \\\n&& dumb-init -V\nCOPY charts/ /etc/kubernikus/charts\n-COPY --from=builder /go/src/github.com/sapcc/kubernikus/bin/linux/ /usr/local/bin/\n+COPY --from=binaries /apiserver /kubernikus /wormhole /usr/local/bin/\nENTRYPOINT [\"dumb-init\", \"--\"]\nCMD [\"apiserver\"]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Dockerfile.kubernikusctl",
"diff": "+ARG VERSION=latest\n+FROM sapcc/binaries:$VERSION as binaries\n+\n+FROM alpine:3.6\n+COPY --from=binaries /kubernikusctl /usr/local/bin/kubernikusctl\n+CMD [\"kubernikusctl\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "-\n-DATE = $(shell date +%Y%m%d%H%M)\n-IMAGE ?= sapcc/kubernikus\n-VERSION ?= latest\n+DATE := $(shell date +%Y%m%d%H%M%S)\n+VERSION ?= v$(DATE)\nGOOS ?= $(shell go env | grep GOOS | cut -d'\"' -f2)\n+IMAGES := $(shell find . -name Dockerfile\\* -type f -maxdepth 1 | cut -f3 -d\".\")\nBINARIES := apiserver kubernikus kubernikusctl wormhole\nLDFLAGS := -X github.com/sapcc/kubernikus/pkg/version.VERSION=$(VERSION)\n@@ -29,11 +28,14 @@ all: $(BINARIES:%=bin/$(GOOS)/%)\nbin/%: $(GOFILES) Makefile\nGOOS=$(*D) GOARCH=amd64 go build $(GOFLAGS) -v -i -o $(@D)/$(@F) ./cmd/$(@F)\n-build: $(BINARIES:bin/linux/%)\n- docker build $(BUILD_ARGS) -t $(IMAGE):$(VERSION) .\n+build: $(IMAGES:%=build/%)\n+push: $(IMAGES:%=push/%)\n+\n+build/%: $(BINARIES:bin/linux/%)\n+ docker build $(BUILD_ARGS) -t sapcc/$(@F):$(VERSION) -f Dockerfile.$(@F) .\n-push:\n- docker push $(IMAGE):$(VERSION)\n+push/%: $(IMAGES:%=build/%)\n+ docker push sapcc/$(@F):$(VERSION)\npkg/api/rest/operations/kubernikus_api.go: swagger.yml\nifndef HAS_SWAGGER\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | build multiple images |
596,240 | 06.10.2017 21:38:15 | -7,200 | 1adc224ffd9366ecd7af41583934396393942cba | multistage image builds | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -37,6 +37,13 @@ resources:\nusername: ((docker-hub-username))\npassword: ((docker-hub-password))\n+ - name: kubernikusctl.image\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikusctl\n+ username: ((docker-hub-username))\n+ password: ((docker-hub-password))\n+\n- name: slack-alert\ntype: slack-notification\nsource:\n@@ -62,9 +69,42 @@ jobs:\ntrigger: true\n- get: kubernikus.version\n+ - put: binaries.image\n+ params:\n+ build: kubernikus.git/\n+ dockerfile: Dockerfile.binaries\n+ tag: kubernikus.version/version\n+ build_args_file: kubernikus.version/properties.json\n+ tag_as_latest: true\n+ cache: true\n+ cache_tag: latest\n+ build_args:\n+ http_proxy: http://proxy.phl.sap.corp:8080\n+ https_proxy: http://proxy.phl.sap.corp:8080\n+ no_proxy: sap.corp,cloud.sap,127.0.0.1,localhost\n+ get_params:\n+ skip_download: true\n+\n+ - aggregate:\n- put: kubernikus.image\nparams:\nbuild: kubernikus.git/\n+ dockerfile: Dockerfile.kubernikus\n+ tag: kubernikus.version/version\n+ build_args_file: kubernikus.version/properties.json\n+ tag_as_latest: true\n+ cache: true\n+ cache_tag: latest\n+ build_args:\n+ http_proxy: http://proxy.phl.sap.corp:8080\n+ https_proxy: http://proxy.phl.sap.corp:8080\n+ no_proxy: sap.corp,cloud.sap,127.0.0.1,localhost\n+ get_params:\n+ skip_download: true\n+ - put: kubernikusctl.image\n+ params:\n+ build: kubernikus.git/\n+ dockerfile: Dockerfile.kubernikusctl\ntag: kubernikus.version/version\nbuild_args_file: kubernikus.version/properties.json\ntag_as_latest: true\n@@ -126,6 +166,26 @@ jobs:\non_failure:\n<<: *post_failure_to_slack\n+ - name: k-staging\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: kubernikus.git\n+ trigger: true\n+ passed: [build]\n+ - get: kubernikus.version\n+ passed: [build]\n+ - get: secrets.git\n+ - task: deploy\n+ file: kubernikus.git/ci/task-helm-upgrade-v1.7.7.yaml\n+ params:\n+ REGION: k-staging\n+ RELEASE: kubernikus\n+ NAMESPACE: kubernikus\n+ GITHUB_TOKEN: ((github-access-token))\n+ on_failure:\n+ <<: *post_failure_to_slack\n+\n- name: eu-nl-1\nserial: true\nplan:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | multistage image builds |
596,240 | 07.10.2017 10:03:49 | -7,200 | 3ae40c1500a557660f14ab8a49609abcd27d7e6c | updates repostiory names | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile.kubernikus",
"new_path": "Dockerfile.kubernikus",
"diff": "ARG VERSION=latest\n-FROM sapcc/binaries:$VERSION as binaries\n+FROM sapcc/kubernikus-binaries:$VERSION as binaries\nFROM alpine:3.6\nMAINTAINER \"Fabian Ruff <fabian.ruff@sap.com>\"\n"
},
{
"change_type": "MODIFY",
"old_path": "Dockerfile.kubernikusctl",
"new_path": "Dockerfile.kubernikusctl",
"diff": "ARG VERSION=latest\n-FROM sapcc/binaries:$VERSION as binaries\n+FROM sapcc/kubernikus-binaries:$VERSION as binaries\nFROM alpine:3.6\nCOPY --from=binaries /kubernikusctl /usr/local/bin/kubernikusctl\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | updates repostiory names |
596,240 | 07.10.2017 11:24:09 | -7,200 | d62bffacf88384fc699f36c57493cb9fca06a16b | multi-stage/multi-image builds | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "Dockerfile",
"diff": "+FROM golang:1.9.0-alpine3.6 as builder\n+WORKDIR /go/src/github.com/sapcc/kubernikus/\n+RUN apk add --no-cache make\n+COPY . .\n+ARG VERSION\n+RUN make all\n+\n+FROM scratch as kubernikus-binaries\n+COPY --from=builder /go/src/github.com/sapcc/kubernikus/bin/linux/* /\n+\n+FROM alpine:3.6 as kubernikusctl\n+COPY --from=kubernikus-binaries /kubernikusctl /usr/local/bin/\n+CMD [\"kubernikusctl\"]\n+\n+FROM alpine:3.6 as kubernikus\n+MAINTAINER \"Fabian Ruff <fabian.ruff@sap.com>\"\n+RUN apk add --no-cache curl iptables\n+RUN curl -Lo /bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 \\\n+ && chmod +x /bin/dumb-init \\\n+ && dumb-init -V\n+COPY charts/ /etc/kubernikus/charts\n+COPY --from=kubernikus-binaries /apiserver /kubernikus /wormhole /usr/local/bin/\n+ENTRYPOINT [\"dumb-init\", \"--\"]\n+CMD [\"apiserver\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "Makefile",
"new_path": "Makefile",
"diff": "DATE := $(shell date +%Y%m%d%H%M%S)\nVERSION ?= v$(DATE)\nGOOS ?= $(shell go env | grep GOOS | cut -d'\"' -f2)\n-IMAGES := $(shell find . -name Dockerfile\\* -type f -maxdepth 1 | cut -f3 -d\".\")\nBINARIES := apiserver kubernikus kubernikusctl wormhole\nLDFLAGS := -X github.com/sapcc/kubernikus/pkg/version.VERSION=$(VERSION)\n@@ -28,14 +27,16 @@ all: $(BINARIES:%=bin/$(GOOS)/%)\nbin/%: $(GOFILES) Makefile\nGOOS=$(*D) GOARCH=amd64 go build $(GOFLAGS) -v -i -o $(@D)/$(@F) ./cmd/$(@F)\n-build: $(IMAGES:%=build/%)\n-push: $(IMAGES:%=push/%)\n+build:\n+ docker build $(BUILD_ARGS) -t sapcc/kubernikus-binaries:$(VERSION) -t sapcc/kubernikus-binaries:latest --target kubernikus-binaries .\n+ docker build $(BUILD_ARGS) -t sapcc/kubernikus:$(VERSION) -t sapcc/kubernikus:latest --target kubernikus .\n+ docker build $(BUILD_ARGS) -t sapcc/kubernikusctl:$(VERSION) -t sapcc/kubernikusctl:latest --target kubernikusctl .\n-build/%: $(BINARIES:bin/linux/%)\n- docker build $(BUILD_ARGS) -t sapcc/$(@F):$(VERSION) -f Dockerfile.$(@F) .\n-\n-push/%: $(IMAGES:%=build/%)\n- docker push sapcc/$(@F):$(VERSION)\n+push:\n+ docker push sapcc/kubernikus:$(VERSION)\n+ docker push sapcc/kubernikus:latest\n+ docker push sapcc/kubernikusctl:$(VERSION)\n+ docker push sapcc/kubernikusctl:latest\npkg/api/rest/operations/kubernikus_api.go: swagger.yml\nifndef HAS_SWAGGER\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | multi-stage/multi-image builds |
596,240 | 07.10.2017 11:24:52 | -7,200 | d70653034cf31f293698d5e3cc2668f68944b804 | adds concourse hacks because of missing docker build --target support | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile.kubernikus",
"new_path": "Dockerfile.kubernikus",
"diff": "ARG VERSION=latest\n-FROM sapcc/kubernikus-binaries:$VERSION as binaries\n+FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries\n-FROM alpine:3.6\n+FROM alpine:3.6 as kubernikus\nMAINTAINER \"Fabian Ruff <fabian.ruff@sap.com>\"\nRUN apk add --no-cache curl iptables\nRUN curl -Lo /bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 \\\n&& chmod +x /bin/dumb-init \\\n&& dumb-init -V\nCOPY charts/ /etc/kubernikus/charts\n-COPY --from=binaries /apiserver /kubernikus /wormhole /usr/local/bin/\n+COPY --from=kubernikus-binaries /apiserver /kubernikus /wormhole /usr/local/bin/\nENTRYPOINT [\"dumb-init\", \"--\"]\nCMD [\"apiserver\"]\n"
},
{
"change_type": "RENAME",
"old_path": "Dockerfile.binaries",
"new_path": "Dockerfile.kubernikus-binaries",
"diff": "@@ -5,5 +5,5 @@ COPY . .\nARG VERSION\nRUN make all\n-FROM scratch\n+FROM scratch as kubernikus-binaries\nCOPY --from=builder /go/src/github.com/sapcc/kubernikus/bin/linux/* /\n"
},
{
"change_type": "MODIFY",
"old_path": "Dockerfile.kubernikusctl",
"new_path": "Dockerfile.kubernikusctl",
"diff": "+FROM scratch as kubernikus-binaries\nARG VERSION=latest\n-FROM sapcc/kubernikus-binaries:$VERSION as binaries\n+FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries\n-FROM alpine:3.6\n-COPY --from=binaries /kubernikusctl /usr/local/bin/kubernikusctl\n+builder /go/src/github.com/sapcc/kubernikus/bin/linux/* /\n+\n+FROM alpine:3.6 as kubernikusctl\n+COPY --from=kubernikus-binaries /kubernikusctl /usr/local/bin/\nCMD [\"kubernikusctl\"]\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds concourse hacks because of missing docker build --target support |
596,240 | 07.10.2017 11:25:19 | -7,200 | 1d9419014e80ddb18422da329787d5a4beaae2b5 | adds pipeline image with kubernikus credentials download support | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/kubernikus-kubectl/Dockerfile",
"diff": "+ARG VERSION=latest\n+FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries\n+\n+FROM alpine:3.6\n+\n+ARG KUBERNETES_VERSION\n+ARG HELM_VERSION\n+\n+RUN apk add --no-cache --virtual=build-dependencies bash jq curl ca-certificates\n+\n+RUN curl -fLo /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/amd64/kubectl \\\n+ && chmod +x /usr/bin/kubectl /usr/bin/kubectl \\\n+ && /usr/bin/kubectl version -c\n+\n+RUN curl http://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -xz \\\n+ && mv linux-amd64/helm /usr/bin/ \\\n+ && rm -rf linux-amd64 \\\n+ && helm version -c \\\n+ && helm init -c\n+\n+ADD kubectl helm /usr/local/bin/\n+COPY --from=kubernikus-binaries /kubernikusctl /usr/local/bin/\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/kubernikus-kubectl/Makefile",
"diff": "+SHELL := /bin/sh\n+IMAGE := sapcc/kubernikus-kubectl\n+\n+KUBERNETES_VERSIONS := v1.7.7 v1.8.0\n+HELM_VERSION := v2.6.1\n+\n+.PHONY: all\n+all: build push\n+\n+.PHONY: build\n+build: $(KUBERNETES_VERSIONS:%=build-%)\n+\n+.PHONY: push\n+push: $(KUBERNETES_VERSIONS:%=push-%)\n+\n+build-%:\n+ docker build -t $(IMAGE):$* --rm \\\n+ --build-arg KUBERNETES_VERSION=$* \\\n+ --build-arg HELM_VERSION=$(HELM_VERSION) \\\n+ .\n+push-%:\n+ docker push $(IMAGE):$*\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/kubernikus-kubectl/README.md",
"diff": "+# Kubectl Container\n+\n+This container contains a `kubectl` binary. It will also automatically fetch\n+short lived certificates from Vault.\n+\n+\n+## Usage\n+\n+You need to pass in the `REGION` and an Github access token `GITHUB_TOKEN` in\n+order to authenticate against Vault.\n+\n+```\n+docker run -ti \\\n+ -e REGION=staging \\\n+ -e GITHUB_TOKEN=be76f8004ffb265993c80d81612cea6aa12345 \\\n+ hub.global.cloud.sap/monsoon/kubectl:v.1.4.6 kubectl get pods\n+```\n+\n+## Concourse Uage\n+\n+```\n+- task: kubectl\n+ config:\n+ platform: 'linux'\n+ image_resource:\n+ type: docker-image\n+ source:\n+ repository: hub.global.cloud.sap/monsoon/kubectl\n+ tag: v1.4.6\n+ run:\n+ path: kubectl\n+ args:\n+ - get\n+ - pods\n+ - --namespace=monsoon3\n+ params:\n+ REGION: staging\n+ GITHUB_TOKEN: {{GITHUB_TOKEN}}\n+```\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/kubernikus-kubectl/helm",
"diff": "+#!/bin/bash\n+set -o errexit\n+set -o pipefail\n+\n+if [ \"$0\" = '/usr/local/bin/helm' ]; then\n+ if [ -z \"$HELM_HOST\" ]; then\n+ if [ ! -f $HOME/.kube/config ]; then\n+ kubernikusctl credentials\n+ fi\n+ fi\n+ exec /usr/bin/helm \"$@\"\n+fi\n+\n+exec \"$@\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/kubernikus-kubectl/kubectl",
"diff": "+#!/bin/bash\n+set -o errexit\n+set -o pipefail\n+\n+if [ \"${1:0:1}\" = '-' ]; then\n+ set -- kubectl \"$@\"\n+fi\n+\n+if [ \"$0\" = '/usr/local/bin/kubectl' ]; then\n+ if [ ! -f $HOME/.kube/config ]; then\n+ kubernikusctl credentials\n+ fi\n+\n+ exec /usr/bin/kubectl \"$@\"\n+fi\n+\n+exec \"$@\"\n+\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds pipeline image with kubernikus credentials download support |
596,240 | 07.10.2017 11:25:53 | -7,200 | 731cfef4f479b4742f881854fa8bd99e4ff2ea56 | builds all images | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -30,6 +30,13 @@ resources:\nprefix: v\nproperty_name: VERSION\n+ - name: kubernikus-binaries.image\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikus-binaries\n+ username: ((docker-hub-username))\n+ password: ((docker-hub-password))\n+\n- name: kubernikus.image\ntype: docker-image\nsource:\n@@ -44,6 +51,14 @@ resources:\nusername: ((docker-hub-username))\npassword: ((docker-hub-password))\n+ - name: kubernikus-kubectl.image\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikus-kubectl\n+ username: ((docker-hub-username))\n+ password: ((docker-hub-password))\n+\n+\n- name: slack-alert\ntype: slack-notification\nsource:\n@@ -63,20 +78,22 @@ resource_types:\njobs:\n- name: build\nserial: true\n+ on_failure:\n+ <<: *post_failure_to_slack\nplan:\n- aggregate:\n- get: kubernikus.git\ntrigger: true\n- get: kubernikus.version\n- - put: binaries.image\n+ - put: kubernikus-binaries.image\nparams:\n- build: kubernikus.git/\n- dockerfile: Dockerfile.binaries\n+ build: kubernikus.git\n+ dockerfile: kubernikus.git/Dockerfile.kubernikus-binaries\ntag: kubernikus.version/version\nbuild_args_file: kubernikus.version/properties.json\ntag_as_latest: true\n- cache: true\n+ cache: false\ncache_tag: latest\nbuild_args:\nhttp_proxy: http://proxy.phl.sap.corp:8080\n@@ -88,12 +105,12 @@ jobs:\n- aggregate:\n- put: kubernikus.image\nparams:\n- build: kubernikus.git/\n- dockerfile: Dockerfile.kubernikus\n+ build: kubernikus.git\n+ dockerfile: kubernikus.git/Dockerfile.kubernikus\ntag: kubernikus.version/version\nbuild_args_file: kubernikus.version/properties.json\ntag_as_latest: true\n- cache: true\n+ cache: false\ncache_tag: latest\nbuild_args:\nhttp_proxy: http://proxy.phl.sap.corp:8080\n@@ -103,12 +120,26 @@ jobs:\nskip_download: true\n- put: kubernikusctl.image\nparams:\n- build: kubernikus.git/\n- dockerfile: Dockerfile.kubernikusctl\n+ build: kubernikus.git\n+ dockerfile: kubernikus.git/Dockerfile.kubernikusctl\ntag: kubernikus.version/version\nbuild_args_file: kubernikus.version/properties.json\ntag_as_latest: true\n- cache: true\n+ cache: false\n+ cache_tag: latest\n+ build_args:\n+ http_proxy: http://proxy.phl.sap.corp:8080\n+ https_proxy: http://proxy.phl.sap.corp:8080\n+ no_proxy: sap.corp,cloud.sap,127.0.0.1,localhost\n+ get_params:\n+ skip_download: true\n+ - put: kubernikus-kubectl.image\n+ params:\n+ build: kubernikus.git/contrib/kubernikus-kubectl\n+ tag: kubernikus.version/version\n+ build_args_file: kubernikus.version/properties.json\n+ tag_as_latest: true\n+ cache: false\ncache_tag: latest\nbuild_args:\nhttp_proxy: http://proxy.phl.sap.corp:8080\n@@ -116,8 +147,6 @@ jobs:\nno_proxy: sap.corp,cloud.sap,127.0.0.1,localhost\nget_params:\nskip_download: true\n- on_failure:\n- <<: *post_failure_to_slack\n- name: staging\nserial: true\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | builds all images |
596,240 | 07.10.2017 11:34:23 | -7,200 | 3d24aef0bffcb3f3491b827daf4cdd85e4e3cc42 | add default versions for helm and kubectl | [
{
"change_type": "MODIFY",
"old_path": "contrib/kubernikus-kubectl/Dockerfile",
"new_path": "contrib/kubernikus-kubectl/Dockerfile",
"diff": "@@ -3,8 +3,8 @@ FROM sapcc/kubernikus-binaries:$VERSION as kubernikus-binaries\nFROM alpine:3.6\n-ARG KUBERNETES_VERSION\n-ARG HELM_VERSION\n+ARG KUBERNETES_VERSION=v1.7.7\n+ARG HELM_VERSION=v2.6.1\nRUN apk add --no-cache --virtual=build-dependencies bash jq curl ca-certificates\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | add default versions for helm and kubectl |
596,240 | 07.10.2017 11:55:14 | -7,200 | fcf4a53d2980012ef94458e6d7f2d9d6f4a796e6 | ok. ok... you can stay | [
{
"change_type": "MODIFY",
"old_path": "contrib/kubernikus-kubectl/Dockerfile",
"new_path": "contrib/kubernikus-kubectl/Dockerfile",
"diff": "@@ -6,7 +6,7 @@ FROM alpine:3.6\nARG KUBERNETES_VERSION=v1.7.7\nARG HELM_VERSION=v2.6.1\n-RUN apk add --no-cache --virtual=build-dependencies ca-certificates\n+RUN apk add --no-cache --virtual=build-dependencies bash jq curl ca-certificates\nRUN curl -fLo /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/amd64/kubectl \\\n&& chmod +x /usr/bin/kubectl /usr/bin/kubectl \\\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | ok. ok... you can stay |
596,240 | 07.10.2017 18:59:23 | -7,200 | 8bf24d9040c8913cf94a55c88947f3969a867ab0 | aligns cmd/ and pkg/cmd package structure. now also matches command layout in the clis | [
{
"change_type": "MODIFY",
"old_path": "cmd/kubernikus/main.go",
"new_path": "cmd/kubernikus/main.go",
"diff": "@@ -15,7 +15,6 @@ func main() {\nbaseName := filepath.Base(os.Args[0])\n-\nerr := kubernikus.NewCommand(baseName).Execute()\ncmd.CheckError(err)\n}\n"
},
{
"change_type": "DELETE",
"old_path": "pkg/cmd/certificates/certificates.go",
"new_path": null,
"diff": "-package certificates\n-\n-import (\n- \"github.com/spf13/cobra\"\n-)\n-\n-func NewCommand() *cobra.Command {\n- c := &cobra.Command{\n- Use: \"certificates\",\n- Short: \"Debug certificates\",\n- }\n-\n- c.AddCommand(\n- NewFilesCommand(),\n- NewPlainCommand(),\n- NewSignCommand(),\n- )\n-\n- return c\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/cmd/kubernikus/certificates.go",
"diff": "+package kubernikus\n+\n+import (\n+ \"github.com/sapcc/kubernikus/pkg/cmd/kubernikus/certificates\"\n+ \"github.com/spf13/cobra\"\n+)\n+\n+func NewCertificatesCommand() *cobra.Command {\n+ c := &cobra.Command{\n+ Use: \"certificates\",\n+ Short: \"Debug certificates\",\n+ }\n+\n+ c.AddCommand(\n+ certificates.NewFilesCommand(),\n+ certificates.NewPlainCommand(),\n+ certificates.NewSignCommand(),\n+ )\n+\n+ return c\n+}\n"
},
{
"change_type": "RENAME",
"old_path": "pkg/cmd/certificates/files.go",
"new_path": "pkg/cmd/kubernikus/certificates/files.go",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "pkg/cmd/certificates/plain.go",
"new_path": "pkg/cmd/kubernikus/certificates/plain.go",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "pkg/cmd/certificates/sign.go",
"new_path": "pkg/cmd/kubernikus/certificates/sign.go",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "pkg/cmd/helm/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "-package helm\n+package kubernikus\nimport (\n\"errors\"\n@@ -15,7 +15,7 @@ import (\nyaml \"gopkg.in/yaml.v2\"\n)\n-func NewCommand() *cobra.Command {\n+func NewHelmCommand() *cobra.Command {\no := NewHelmOptions()\nc := &cobra.Command{\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/kubernikus.go",
"new_path": "pkg/cmd/kubernikus/kubernikus.go",
"diff": "@@ -3,9 +3,6 @@ package kubernikus\nimport (\n\"flag\"\n- \"github.com/sapcc/kubernikus/pkg/cmd/certificates\"\n- \"github.com/sapcc/kubernikus/pkg/cmd/helm\"\n- \"github.com/sapcc/kubernikus/pkg/cmd/operator\"\n\"github.com/spf13/cobra\"\n)\n@@ -17,9 +14,9 @@ func NewCommand(name string) *cobra.Command {\n}\nc.AddCommand(\n- certificates.NewCommand(),\n- helm.NewCommand(),\n- operator.NewCommand(),\n+ NewCertificatesCommand(),\n+ NewHelmCommand(),\n+ NewOperatorCommand(),\n)\nc.PersistentFlags().AddGoFlagSet(flag.CommandLine)\n"
},
{
"change_type": "RENAME",
"old_path": "pkg/cmd/operator/operator.go",
"new_path": "pkg/cmd/kubernikus/operator.go",
"diff": "-package operator\n+package kubernikus\nimport (\n\"errors\"\n@@ -15,7 +15,7 @@ import (\n\"github.com/spf13/pflag\"\n)\n-func NewCommand() *cobra.Command {\n+func NewOperatorCommand() *cobra.Command {\no := NewOperatorOptions()\nif f := goflag.Lookup(\"logtostderr\"); f != nil {\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | aligns cmd/ and pkg/cmd package structure. now also matches command layout in the clis |
596,240 | 07.10.2017 19:23:52 | -7,200 | 39b9f00f79ccb245fd2ebc3a28a2e0c5598b01f2 | enables clusterIP and loadBalancer as service type | [
{
"change_type": "MODIFY",
"old_path": "charts/k8sniff/templates/service.yaml",
"new_path": "charts/k8sniff/templates/service.yaml",
"diff": "@@ -3,12 +3,18 @@ kind: Service\nmetadata:\nname: k8sniff-ingress-lb\nspec:\n+{{- if .Values.external_service_ip }}\ntype: ClusterIP\n+{{- else }}\n+ type: LoadBalancer\n+{{- end }}\nports:\n- port: 443\ntargetPort: 8443\nprotocol: TCP\nselector:\nrole: k8sniff-ingress-lb\n+{{- if .Values.external_service_ip }}\nexternalIPs:\n- - {{ required \"missing external_service_ip\" .Values.external_service_ip }}\n+ - {{ .Values.external_service_ip }}\n+{{- end }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | enables clusterIP and loadBalancer as service type |
596,240 | 09.10.2017 11:18:31 | -7,200 | 8fc44e5eb1d2aa22aa8d52ebe3e8c72f84875f71 | remove overlap between podcirs/servicecdrs and default network cidr. supports max. 256 nodes, 65k pods, 32k services. more ndoes only possible by switching to 240.0.0.0/4 | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -27,8 +27,8 @@ kubernikus: {}\n# Use these keys to specify the certs as helm values\ncerts: {}\n-clusterCIDR: 10.180.128.0/17\n-serviceCIDR: 10.180.1.0/24\n+clusterCIDR: 198.19.0.0/16\n+serviceCIDR: 198.18.128.0/17\napi:\nreplicaCount: 1\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | remove overlap between podcirs/servicecdrs and default network cidr. supports max. 256 nodes, 65k pods, 32k services. more ndoes only possible by switching to 240.0.0.0/4 |
596,240 | 09.10.2017 11:19:55 | -7,200 | 78eaa96771cba5a5a68e5544baeac0aaea35945e | adds flag to allow for passing in a kluster name | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -79,6 +79,7 @@ func (o *CredentialsOptions) BindFlags(flags *pflag.FlagSet) {\nflags.StringVar(&o.auth.Scope.ProjectName, \"project-name\", o.auth.Scope.ProjectName, \"Scope to this project [OS_PROJECT_NAME]\")\nflags.StringVar(&o.auth.Scope.DomainName, \"project-domain-name\", o.auth.Scope.DomainName, \"Domain of the project [OS_PROJECT_DOMAIN_NAME]\")\nflags.StringVar(&o.url, \"url\", o.url, \"URL for Kubernikus API\")\n+ flags.StringVar(&o.name, \"name\", o.name, \"Cluster Name\")\n}\nfunc (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds flag to allow for passing in a kluster name |
596,240 | 09.10.2017 11:25:25 | -7,200 | 43f09db7637d113a62af88d44b3adb45f464eb7a | advetises a loopback address
This will address will be picked up by kube-proxy on each node. It will
create IPTables to route the default kubernetes service to this IP.
In addition the wormhole client, will start listening on this address
too and forward traffic back through the tunnel to the apiserver. | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/api.yaml",
"new_path": "charts/kube-master/templates/api.yaml",
"diff": "@@ -101,6 +101,7 @@ spec:\n- apiserver\n- --etcd-servers=http://{{ include \"etcd.fullname\" . }}:2379\n- --secure-port=6443\n+ - --advertise-address={{ .Values.advertiseAddresss }}\n- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota\n- --allow-privileged=true\n- --authorization-mode=Node,RBAC\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -29,6 +29,7 @@ certs: {}\nclusterCIDR: 198.19.0.0/16\nserviceCIDR: 198.18.128.0/17\n+advertiseAddress: 127.0.0.5\napi:\nreplicaCount: 1\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | advetises a loopback address
This will address will be picked up by kube-proxy on each node. It will
create IPTables to route the default kubernetes service to this IP.
In addition the wormhole client, will start listening on this address
too and forward traffic back through the tunnel to the apiserver. |
596,240 | 09.10.2017 13:15:40 | -7,200 | 30af19bf3539b74b88b24b387b55803d50c541c7 | adds helm install instructions | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "# Kubernikus\nConverged Cloud goes Containers\n+\n+## Setting up a new Region\n+\n+### Prepare Tiller with RBAC\n+```\n+kubectl -n kube-system create sa tiller\n+kubectl create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount=kube-system:tiller\n+helm init --service-account tiller\n+```\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds helm install instructions |
596,240 | 09.10.2017 14:44:45 | -7,200 | dddc5020a72ecbc6645a927218837c6e2cb35a79 | this needs to be the tls-ca certificate. client-validation happens in the apiserver anyway... | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/controller-manager.yaml",
"new_path": "charts/kube-master/templates/controller-manager.yaml",
"diff": "@@ -73,7 +73,7 @@ spec:\n- --controllers=*,bootstrapsigner,tokencleaner\n- --kubeconfig=/etc/kubernetes/config/kubeconfig\n- --leader-elect=false\n- - --root-ca-file=/etc/kubernetes/certs/apiserver-clients-ca.pem\n+ - --root-ca-file=/etc/kubernetes/certs/tls-ca.pem\n- --service-account-private-key-file=/etc/kubernetes/certs/apiserver-clients-ca-key.pem\n- --service-cluster-ip-range={{ .Values.serviceCIDR }}\n- --use-service-account-credentials\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | this needs to be the tls-ca certificate. client-validation happens in the apiserver anyway... |
596,240 | 09.10.2017 14:51:23 | -7,200 | c1e8ea6e16b74ddbe430dccf81db3c7960bc5741 | includes Tiller hacks | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -10,3 +10,45 @@ kubectl -n kube-system create sa tiller\nkubectl create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount=kube-system:tiller\nhelm init --service-account tiller\n```\n+\n+### Tiller Hacks until Workhole Reverse Tunnel works\n+`kubectl edit deployment/tiller-deploy`:\n+```\n+ volumes:\n+ - configMap:\n+ defaultMode: 420\n+ name: tiller-kubeconfig\n+ name: kubeconfig\n+ containers:\n+ - env:\n+ - name: TILLER_NAMESPACE\n+ value: kube-system\n+ - name: KUBECONFIG\n+ value: /etc/tiller/kubeconfig\n+ - name: KUBERNETES_SERVICE_HOST\n+\n+```\n+\n+Create Configmap. Edit `server`:\n+```\n+cat <<EOF | kubectl create configmap tiller-kubeconfig -n kube-system --from-file -\n+apiVersion: v1\n+kind: Config\n+clusters:\n+- cluster:\n+ certificate-authority: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt\n+ server: https://k-staging-7df1acb1a2f2478eadf3f350d3f44c51.kubernikus-staging.admin.cloud.sap\n+ name: default\n+contexts:\n+- context:\n+ cluster: default\n+ namespace: default\n+ user: default\n+ name: default\n+current-context: default\n+users:\n+- name: default\n+ user:\n+ tokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token\n+EOF\n+```\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | includes Tiller hacks |
596,240 | 09.10.2017 15:55:03 | -7,200 | 43014afe5c3fb75b32aa16ad1206da08783e7a9e | uses kubernikusctl to fetch credentials | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -203,12 +203,18 @@ jobs:\npassed: [build]\n- get: secrets.git\n- task: deploy\n- file: kubernikus.git/ci/task-helm-upgrade-v1.7.7.yaml\n+ file: kubernikus.git/ci/task-helm-upgrade-kubernikus.yaml\nparams:\n- REGION: k-staging\n+ NAMESPACE: kubernikus-system\nRELEASE: kubernikus\n- NAMESPACE: kubernikus\n- GITHUB_TOKEN: ((github-access-token))\n+ OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-staging-username}}\n+ OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_USER_DOMAIN_NAME: monsoon3\n+ OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_DOMAIN_NAME: ccadmin\n+ KUBERNIKUS_NAME: k-staging\n+ KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\non_failure:\n<<: *post_failure_to_slack\n"
},
{
"change_type": "RENAME",
"old_path": "ci/task-helm-upgrade-v1.7.7.yaml",
"new_path": "ci/task-helm-upgrade-admin.yaml",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "ci/task-helm-upgrade-kubernikus.yaml",
"diff": "+---\n+platform: 'linux'\n+\n+image_resource:\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikus-kubectl\n+ tag: 'latest'\n+\n+inputs:\n+ - name: kubernikus.git\n+ - name: kubernikus.version\n+ - name: secrets.git\n+\n+run:\n+ path: /bin/sh\n+ args:\n+ - -c\n+ - |\n+ set -exo pipefail\n+ VERSION=$(cat kubernikus.version/version)\n+ kubernikusctl credentials\n+ helm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n+ helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$RELEASE.yaml --set imageTag=$VERSION\n+ kubectl rollout status deployment/kubernikus-api --namespace=$NAMESPACE\n+ kubectl rollout status deployment/kubernikus-operator --namespace=$NAMESPACE\n+\n+params:\n+ NAMESPACE:\n+ RELEASE:\n+ OS_AUTH_URL:\n+ OS_USERNAME:\n+ OS_PASSWORD:\n+ OS_USER_DOMAIN_NAME:\n+ OS_PROJECT_NAME:\n+ OS_PROJECT_DOMAIN_NAME:\n+ KUBERNIKUS_NAME:\n+ KUBERNIKUS_URL:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | uses kubernikusctl to fetch credentials |
596,240 | 09.10.2017 15:55:26 | -7,200 | 73b23187b8cfbb7ab295c7fe1d22b2f30b905239 | removes staging step | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -145,33 +145,6 @@ jobs:\nget_params:\nskip_download: true\n- - name: staging\n- serial: true\n- plan:\n- - aggregate:\n- - get: kubernikus.git\n- trigger: true\n- passed: [build]\n- - get: kubernikus.version\n- passed: [build]\n- - get: secrets.git\n-\n- - task: deploy\n- file: kubernikus.git/ci/task-helm-upgrade.yaml\n- params:\n- REGION: staging\n- RELEASE: kubernikus\n- NAMESPACE: kube-system\n- GITHUB_TOKEN: ((github-access-token))\n- - task: prune replicasets\n- file: kubernikus.git/ci/prune-replicasets.yaml\n- params:\n- REGION: staging\n- NAMESPACE: kube-system\n- GITHUB_TOKEN: {{github-access-token}}\n- on_failure:\n- <<: *post_failure_to_slack\n-\n- name: admin-staging\nserial: true\nplan:\n@@ -183,7 +156,7 @@ jobs:\npassed: [build]\n- get: secrets.git\n- task: deploy\n- file: kubernikus.git/ci/task-helm-upgrade-v1.7.7.yaml\n+ file: kubernikus.git/ci/task-helm-upgrade-admin.yaml\nparams:\nREGION: admin\nRELEASE: kubernikus-staging\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | removes staging step |
596,240 | 09.10.2017 15:57:49 | -7,200 | 7b5296d3930ac41c18b75e6984146f0ff1cf2991 | fixes missing staging prerequisite | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -197,9 +197,9 @@ jobs:\n- aggregate:\n- get: kubernikus.git\ntrigger: true\n- passed: [staging]\n+ passed: [k-staging]\n- get: kubernikus.version\n- passed: [staging]\n+ passed: [k-staging]\n- get: secrets.git\n- task: deploy\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fixes missing staging prerequisite |
596,240 | 09.10.2017 16:17:15 | -7,200 | 38191e672efdcaf214bada74f3e1a866ee3e1022 | requires region to be passed in for values | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -178,12 +178,13 @@ jobs:\n- task: deploy\nfile: kubernikus.git/ci/task-helm-upgrade-kubernikus.yaml\nparams:\n+ REGION: k-staging\nNAMESPACE: kubernikus-system\nRELEASE: kubernikus\nOS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\nOS_USERNAME: {{kubernikus-staging-username}}\nOS_PASSWORD: {{kubernikus-staging-password}}\n- OS_USER_DOMAIN_NAME: monsoon3\n+ OS_USER_DOMAIN_NAME: ccadmin\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-staging\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task-helm-upgrade-kubernikus.yaml",
"new_path": "ci/task-helm-upgrade-kubernikus.yaml",
"diff": "@@ -26,6 +26,7 @@ run:\nkubectl rollout status deployment/kubernikus-operator --namespace=$NAMESPACE\nparams:\n+ REGION:\nNAMESPACE:\nRELEASE:\nOS_AUTH_URL:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | requires region to be passed in for values |
596,240 | 09.10.2017 18:04:10 | -7,200 | 38f66ee7a19d6064b00f4d72f37902939539c351 | split pipelines to avoid mess | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "ci/pipeline-admin.yaml",
"diff": "+post_failure_to_slack: &post_failure_to_slack\n+ put: slack-alert\n+ params:\n+ channel: '#kubernikus'\n+ username: 'Concourse'\n+ icon_emoji: ':airplane:'\n+ silent: 'true'\n+ text: |\n+ :boom: <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|$BUILD_PIPELINE_NAME $BUILD_JOB_NAME job #$BUILD_NAME failed>\n+\n+resources:\n+ - name: kubernikus.git\n+ type: git\n+ source:\n+ username: sapcc-bot\n+ password: ((github-com-access-token))\n+ uri: https://github.com/sapcc/kubernikus.git\n+ branch: master\n+\n+ - name: secrets.git\n+ type: git\n+ source:\n+ uri: git@github.wdf.sap.corp:cc/secrets.git\n+ private_key: ((secrets-ssh-key))\n+ branch: master\n+\n+ - name: kubernikus.image\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikus\n+ username: ((docker-hub-username))\n+ password: ((docker-hub-password))\n+\n+ - name: slack-alert\n+ type: slack-notification\n+ source:\n+ url: {{slack-webhook-url}}\n+\n+resource_types:\n+ - name: slack-notification\n+ type: docker-image\n+ source:\n+ repository: cfcommunity/slack-notification-resource\n+ tag: latest\n+\n+jobs:\n+ - name: staging\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: kubernikus.git\n+ - get: secrets.git\n+ - get: kubernikus.image\n+ trigger: true\n+ - task: deploy\n+ file: kubernikus.git/ci/task-helm-upgrade-kubernikus-admin.yaml\n+ params:\n+ KUBERNIKUS_NAME: kubernikus-staging # should be k-staging if you copy this for other regions\n+ GITHUB_TOKEN: ((github-access-token))\n+ on_failure:\n+ <<: *post_failure_to_slack\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -58,7 +58,6 @@ resources:\nusername: ((docker-hub-username))\npassword: ((docker-hub-password))\n-\n- name: slack-alert\ntype: slack-notification\nsource:\n@@ -145,27 +144,7 @@ jobs:\nget_params:\nskip_download: true\n- - name: a-staging\n- serial: true\n- plan:\n- - aggregate:\n- - get: kubernikus.git\n- trigger: true\n- passed: [build]\n- - get: kubernikus.version\n- passed: [build]\n- - get: secrets.git\n- - task: deploy\n- file: kubernikus.git/ci/task-helm-upgrade-admin.yaml\n- params:\n- REGION: admin\n- RELEASE: kubernikus-staging\n- NAMESPACE: kubernikus-staging\n- GITHUB_TOKEN: ((github-access-token))\n- on_failure:\n- <<: *post_failure_to_slack\n-\n- - name: k-staging\n+ - name: staging\nserial: true\nplan:\n- aggregate:\n@@ -178,9 +157,6 @@ jobs:\n- task: deploy\nfile: kubernikus.git/ci/task-helm-upgrade-kubernikus.yaml\nparams:\n- REGION: k-staging\n- NAMESPACE: kubernikus-system\n- RELEASE: kubernikus\nOS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\nOS_USERNAME: {{kubernikus-staging-username}}\nOS_PASSWORD: {{kubernikus-staging-password}}\n@@ -198,9 +174,9 @@ jobs:\n- aggregate:\n- get: kubernikus.git\ntrigger: true\n- passed: [k-staging]\n+ passed: [staging]\n- get: kubernikus.version\n- passed: [k-staging]\n+ passed: [staging]\n- get: secrets.git\n- task: deploy\n"
},
{
"change_type": "RENAME",
"old_path": "ci/task-helm-upgrade-admin.yaml",
"new_path": "ci/task-helm-upgrade-kubernikus-admin.yaml",
"diff": "@@ -20,12 +20,10 @@ run:\nset -exo pipefail\nVERSION=$(cat kubernikus.version/version)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$RELEASE.yaml --set imageTag=$VERSION\n- kubectl rollout status deployment/kubernikus-api --namespace=$NAMESPACE\n- kubectl rollout status deployment/kubernikus-operator --namespace=$NAMESPACE\n+ helm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --values secrets.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\n+ kubectl rollout status deployment/kubernikus-api --namespace=$KUBERNIKUS_NAME\n+ kubectl rollout status deployment/kubernikus-operator --namespace=$KUBERNIKUS_NAME\nparams:\n- NAMESPACE:\n- RELEASE:\n- REGION:\n+ KUBERNIKUS_NAME:\nGITHUB_TOKEN:\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task-helm-upgrade-kubernikus.yaml",
"new_path": "ci/task-helm-upgrade-kubernikus.yaml",
"diff": "@@ -21,14 +21,11 @@ run:\nVERSION=$(cat kubernikus.version/version)\nkubernikusctl credentials\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade $RELEASE kubernikus.git/charts/kubernikus/ --values secrets.git/$REGION/values/$RELEASE.yaml --set imageTag=$VERSION\n- kubectl rollout status deployment/kubernikus-api --namespace=$NAMESPACE\n- kubectl rollout status deployment/kubernikus-operator --namespace=$NAMESPACE\n+ helm upgrade kubernikus kubernikus.git/charts/kubernikus/ --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus.yaml --set imageTag=$VERSION --install\n+ kubectl rollout status deployment/kubernikus-api --namespace=kubernikus-system\n+ kubectl rollout status deployment/kubernikus-operator --namespace=kubernikus-system\nparams:\n- REGION:\n- NAMESPACE:\n- RELEASE:\nOS_AUTH_URL:\nOS_USERNAME:\nOS_PASSWORD:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | split pipelines to avoid mess |
596,240 | 09.10.2017 18:10:40 | -7,200 | 25a8875b146489f19cac2bfd75f59019de584107 | picks up version from image tag | [
{
"change_type": "MODIFY",
"old_path": "ci/task-helm-upgrade-kubernikus-admin.yaml",
"new_path": "ci/task-helm-upgrade-kubernikus-admin.yaml",
"diff": "@@ -9,8 +9,8 @@ image_resource:\ninputs:\n- name: kubernikus.git\n- - name: kubernikus.version\n- name: secrets.git\n+ - name: kubernikus.image\nrun:\npath: /bin/sh\n@@ -18,7 +18,7 @@ run:\n- -c\n- |\nset -exo pipefail\n- VERSION=$(cat kubernikus.version/version)\n+ VERSION=$(cat kubernikus.image/tag)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\nhelm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --values secrets.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\nkubectl rollout status deployment/kubernikus-api --namespace=$KUBERNIKUS_NAME\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | picks up version from image tag |
596,240 | 10.10.2017 10:48:52 | -7,200 | 5fec669821a38bc9036f4a2bf82ab0a539937134 | fixessss to many s | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/api.yaml",
"new_path": "charts/kube-master/templates/api.yaml",
"diff": "@@ -101,7 +101,7 @@ spec:\n- apiserver\n- --etcd-servers=http://{{ include \"etcd.fullname\" . }}:2379\n- --secure-port=6443\n- - --advertise-address={{ .Values.advertiseAddresss }}\n+ - --advertise-address={{ .Values.advertiseAddress }}\n- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota\n- --allow-privileged=true\n- --authorization-mode=Node,RBAC\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fixessss to many s |
596,240 | 10.10.2017 14:41:40 | -7,200 | 4c0fcf18d1537a51b815d1e4674fa3a2bdf263d6 | major refactoring again | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -18,16 +18,16 @@ resources:\nbranch: master\ndepth: 1\n- #- name: charts.git\n- # type: git\n- # source:\n- # username: sapcc-bot\n- # password: ((github-com-access-token))\n- # uri: https://github.com/sapcc/kubernikus.git\n- # branch: master\n- # depth: 1\n- # params:\n- # paths: [\"charts/**\"]\n+ - name: charts.git\n+ type: git\n+ source:\n+ username: sapcc-bot\n+ password: ((github-com-access-token))\n+ uri: https://github.com/sapcc/kubernikus.git\n+ branch: master\n+ depth: 1\n+ params:\n+ paths: [\"charts/**\"]\n- name: pipeline.git\ntype: git\n@@ -103,17 +103,28 @@ groups:\njobs:\n- build\n- helm_staging\n- - helm-admin_staging\n- e2e\n- rollout\n- helm_eu-nl-1\n+ - name: admin\n+ jobs:\n+ - helm-admin_staging\n+ - rollout_admin\n- helm-admin_eu-nl-1\n- name: kubernikus-system\n+ jobs:\n- helm_staging_kubernikus-system\n- rollout_kubernikus-system\n- helm_eu-nl-1_kubernikus-system\njobs:\n+\n+####################################################################################\n+#\n+# kubernikus\n+#\n+####################################################################################\n+\n- name: build\nserial: true\non_failure:\n@@ -202,34 +213,16 @@ jobs:\nKUBERNIKUS_NAME: k-staging\nKUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n- - name: helm-admin_staging\n- serial: true\n- plan:\n- - aggregate:\n- - get: kubernikus.git\n- passed: [build]\n- - get: kubernikus.version\n- passed: [build]\n- trigger: true\n- - get: secrets.git\n- - get: pipeline.git\n- - task: deploy\n- file: pipeline.git/ci/task_helm-admin_kubernikus.yaml\n- params:\n- REGION: admin\n- KUBERNIKUS_NAME: kubernikus-staging # should be k-staging if you copy this for other regions\n- GITHUB_TOKEN: ((github-access-token))\n-\n- name: e2e\nserial: true\nplan:\n- aggregate:\n- get: kubernikus.git\n- passed: [helm_staging, helm-admin_staging]\n+ passed: [helm_staging]\nparams:\ndepth: 0\n- get: kubernikus.version\n- passed: [helm_staging, helm-admin_staging]\n+ passed: [helm_staging]\ntrigger: true\n- name: rollout\n@@ -263,14 +256,49 @@ jobs:\non_failure:\n<<: *post_failure_to_slack\n+####################################################################################\n+#\n+# admin\n+#\n+####################################################################################\n+#\n+ - name: helm-admin_staging\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: kubernikus.git\n+ passed: [build]\n+ - get: kubernikus.version\n+ passed: [build]\n+ trigger: true\n+ - get: secrets.git\n+ - get: pipeline.git\n+ - task: deploy\n+ file: pipeline.git/ci/task_helm-admin_kubernikus.yaml\n+ params:\n+ REGION: admin\n+ KUBERNIKUS_NAME: kubernikus-staging # should be k-staging if you copy this for other regions\n+ GITHUB_TOKEN: ((github-access-token))\n+\n+ - name: rollout_admin\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: kubernikus.git\n+ passed: [helm-admin_staging]\n+ params:\n+ depth: 0\n+ - get: kubernikus.version\n+ passed: [helm-admin_staging]\n+\n- name: helm-admin_eu-nl-1\nserial: true\nplan:\n- aggregate:\n- get: kubernikus.git\n- passed: [rollout]\n+ passed: [rollout_admin]\n- get: kubernikus.version\n- passed: [rollout]\n+ passed: [rollout_admin]\ntrigger: true\n- get: secrets.git\n- get: pipeline.git\n@@ -282,3 +310,58 @@ jobs:\nGITHUB_TOKEN: ((github-access-token))\non_failure:\n<<: *post_failure_to_slack\n+\n+####################################################################################\n+#\n+# kubernikus-system\n+#\n+####################################################################################\n+\n+ - name: helm_staging_kubernikus-system\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: charts.git\n+ - get: secrets.git\n+ - get: pipeline.git\n+ - task: deploy\n+ file: pipeline.git/ci/task_helm_kubernikus-system.yaml\n+ params:\n+ OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-staging-username}}\n+ OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_USER_DOMAIN_NAME: ccadmin\n+ OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_DOMAIN_NAME: ccadmin\n+ KUBERNIKUS_NAME: k-staging\n+ KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n+\n+ - name: rollout_kubernikus-system\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: charts.git\n+ passed: [helm_staging_kubernikus-system]\n+ params:\n+ depth: 0\n+\n+ - name: helm_eu-nl-1_kubernikus-system\n+ serial: true\n+ plan:\n+ - aggregate:\n+ - get: charts.git\n+ passed: [rollout_kubernikus-system]\n+ trigger: true\n+ - get: secrets.git\n+ - get: pipeline.git\n+ - task: deploy\n+ file: pipeline.git/ci/task_helm_kubernikus-system.yaml\n+ params:\n+ OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-staging-username}}\n+ OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_USER_DOMAIN_NAME: ccadmin\n+ OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_DOMAIN_NAME: ccadmin\n+ KUBERNIKUS_NAME: k-eu-nl-1\n+ KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "ci/task-helm-upgrade-kubernikus-system.yaml",
"diff": "+---\n+platform: 'linux'\n+\n+image_resource:\n+ type: docker-image\n+ source:\n+ repository: sapcc/kubernikus-kubectl\n+ tag: 'latest'\n+\n+inputs:\n+ - name: charts.git\n+ - name: secrets.git\n+\n+run:\n+ path: /bin/sh\n+ args:\n+ - -c\n+ - |\n+ set -exo pipefail\n+ kubernikusctl credentials\n+ helm dep up --skip-refresh charts.git/charts/kubernikus-system/\n+ helm upgrade kubernikus charts.git/charts/kubernikus-system/ --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\n+\n+params:\n+ OS_AUTH_URL:\n+ OS_USERNAME:\n+ OS_PASSWORD:\n+ OS_USER_DOMAIN_NAME:\n+ OS_PROJECT_NAME:\n+ OS_PROJECT_DOMAIN_NAME:\n+ KUBERNIKUS_NAME:\n+ KUBERNIKUS_URL:\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task_helm-admin_kubernikus.yaml",
"new_path": "ci/task_helm-admin_kubernikus.yaml",
"diff": "@@ -20,7 +20,7 @@ run:\nset -exo pipefail\nVERSION=$(cat kubernikus.version/version)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --values kubernikus.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\n+ helm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --values secrets.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\nkubectl rollout status deployment/kubernikus-api --namespace=$KUBERNIKUS_NAME\nkubectl rollout status deployment/kubernikus-operator --namespace=$KUBERNIKUS_NAME\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | major refactoring again |
596,240 | 10.10.2017 15:43:19 | -7,200 | 17ed898b2965e7005559b6a146aa25700b032243 | always add namespace (install works then too) | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -277,7 +277,7 @@ jobs:\nfile: pipeline.git/ci/task_helm-admin_kubernikus.yaml\nparams:\nREGION: admin\n- KUBERNIKUS_NAME: kubernikus-staging # should be k-staging if you copy this for other regions\n+ KUBERNIKUS_NAME: kubernikus-staging\nGITHUB_TOKEN: ((github-access-token))\n- name: rollout_admin\n@@ -306,7 +306,7 @@ jobs:\nfile: pipeline.git/ci/task_helm-admin_kubernikus.yaml\nparams:\nREGION: admin\n- KUBERNIKUS_NAME: k-eu-nl-1\n+ KUBERNIKUS_NAME: kubernikus-eu-nl-1\nGITHUB_TOKEN: ((github-access-token))\non_failure:\n<<: *post_failure_to_slack\n"
},
{
"change_type": "DELETE",
"old_path": "ci/task-helm-upgrade-kubernikus-system.yaml",
"new_path": null,
"diff": "----\n-platform: 'linux'\n-\n-image_resource:\n- type: docker-image\n- source:\n- repository: sapcc/kubernikus-kubectl\n- tag: 'latest'\n-\n-inputs:\n- - name: charts.git\n- - name: secrets.git\n-\n-run:\n- path: /bin/sh\n- args:\n- - -c\n- - |\n- set -exo pipefail\n- kubernikusctl credentials\n- helm dep up --skip-refresh charts.git/charts/kubernikus-system/\n- helm upgrade kubernikus charts.git/charts/kubernikus-system/ --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\n-\n-params:\n- OS_AUTH_URL:\n- OS_USERNAME:\n- OS_PASSWORD:\n- OS_USER_DOMAIN_NAME:\n- OS_PROJECT_NAME:\n- OS_PROJECT_DOMAIN_NAME:\n- KUBERNIKUS_NAME:\n- KUBERNIKUS_URL:\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task_helm-admin_kubernikus.yaml",
"new_path": "ci/task_helm-admin_kubernikus.yaml",
"diff": "@@ -20,7 +20,7 @@ run:\nset -exo pipefail\nVERSION=$(cat kubernikus.version/version)\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --values secrets.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\n+ helm upgrade $KUBERNIKUS_NAME kubernikus.git/charts/kubernikus/ --namespace=$KUBERNIKUS_NAME --values secrets.git/admin/values/$KUBERNIKUS_NAME.yaml --set imageTag=$VERSION --install\nkubectl rollout status deployment/kubernikus-api --namespace=$KUBERNIKUS_NAME\nkubectl rollout status deployment/kubernikus-operator --namespace=$KUBERNIKUS_NAME\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task_helm_kubernikus-system.yaml",
"new_path": "ci/task_helm_kubernikus-system.yaml",
"diff": "@@ -19,7 +19,7 @@ run:\nset -exo pipefail\nkubernikusctl credentials\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus-system/\n- helm upgrade kubernikus kubernikus.git/charts/kubernikus-system/ --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\n+ helm upgrade kubernikus-system kubernikus.git/charts/kubernikus-system/ --namespace=kubernikus-system--values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\nparams:\nOS_AUTH_URL:\n"
},
{
"change_type": "MODIFY",
"old_path": "ci/task_helm_kubernikus.yaml",
"new_path": "ci/task_helm_kubernikus.yaml",
"diff": "@@ -21,7 +21,7 @@ run:\nVERSION=$(cat kubernikus.version/version)\nkubernikusctl credentials\nhelm dep up --skip-refresh kubernikus.git/charts/kubernikus/\n- helm upgrade kubernikus kubernikus.git/charts/kubernikus/ --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus.yaml --set imageTag=$VERSION --install\n+ helm upgrade kubernikus kubernikus.git/charts/kubernikus/ --namespace=kubernikus-system --values secrets.git/$KUBERNIKUS_NAME/values/kubernikus.yaml --set imageTag=$VERSION --install\nkubectl rollout status deployment/kubernikus-api --namespace=kubernikus-system\nkubectl rollout status deployment/kubernikus-operator --namespace=kubernikus-system\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | always add namespace (install works then too) |
596,240 | 10.10.2017 16:27:11 | -7,200 | 0504b0a1434d2a0ed22480749f2c90304af10802 | sets namespace | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/api.yaml",
"new_path": "charts/kubernikus/templates/api.yaml",
"diff": "@@ -25,6 +25,7 @@ spec:\n{{- /* This is a bit convoluted but making sure that the url ends with /v3 */}}\n- --auth-url={{ trimSuffix \"/\" .Values.openstack.auth_url | trimSuffix \"/v3\" }}/v3\n- --v={{ default 1 .Values.api.log_level }}\n+ - --namespace={{ default kubernikus .Values.namespace }}\nports:\n- name: http\ncontainerPort: {{ .Values.api.port }}\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/operator.yaml",
"new_path": "charts/kubernikus/templates/operator.yaml",
"diff": "@@ -30,4 +30,5 @@ spec:\n- --auth-project={{ .Values.openstack.auth_project }}\n- --auth-project-domain={{ .Values.openstack.auth_project_domain }}\n- --kubernikus-domain={{ .Values.kubernikus.domain }}\n+ - --namespace={{ default kubernikus .Values.namespace }}\n- --v={{ default 1 .Values.groundctl.log_level }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | sets namespace |
596,240 | 10.10.2017 16:39:07 | -7,200 | 2a1213a740509a03cc636af9474164471911a649 | now with proper quotes | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/api.yaml",
"new_path": "charts/kubernikus/templates/api.yaml",
"diff": "@@ -25,7 +25,7 @@ spec:\n{{- /* This is a bit convoluted but making sure that the url ends with /v3 */}}\n- --auth-url={{ trimSuffix \"/\" .Values.openstack.auth_url | trimSuffix \"/v3\" }}/v3\n- --v={{ default 1 .Values.api.log_level }}\n- - --namespace={{ default kubernikus .Values.namespace }}\n+ - --namespace={{ default \"kubernikus\" .Values.namespace }}\nports:\n- name: http\ncontainerPort: {{ .Values.api.port }}\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/operator.yaml",
"new_path": "charts/kubernikus/templates/operator.yaml",
"diff": "@@ -30,5 +30,5 @@ spec:\n- --auth-project={{ .Values.openstack.auth_project }}\n- --auth-project-domain={{ .Values.openstack.auth_project_domain }}\n- --kubernikus-domain={{ .Values.kubernikus.domain }}\n- - --namespace={{ default kubernikus .Values.namespace }}\n+ - --namespace={{ default \"kubernikus\" .Values.namespace }}\n- --v={{ default 1 .Values.groundctl.log_level }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | now with proper quotes |
596,240 | 10.10.2017 16:57:38 | -7,200 | 0aa406aee721be82dc30a6c80a56215ffe74b0da | more confusion with values | [
{
"change_type": "ADD",
"old_path": "charts/kubernikus/charts/k8sniff-0.1.0.tgz",
"new_path": "charts/kubernikus/charts/k8sniff-0.1.0.tgz",
"diff": "Binary files /dev/null and b/charts/kubernikus/charts/k8sniff-0.1.0.tgz differ\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/operator.yaml",
"new_path": "charts/kubernikus/templates/operator.yaml",
"diff": "@@ -29,6 +29,6 @@ spec:\n- --auth-domain={{ .Values.openstack.auth_domain }}\n- --auth-project={{ .Values.openstack.auth_project }}\n- --auth-project-domain={{ .Values.openstack.auth_project_domain }}\n- - --kubernikus-domain={{ .Values.kubernikus.domain }}\n+ - --kubernikus-domain={{ .Values.domain }}\n- --namespace={{ default \"kubernikus\" .Values.namespace }}\n- --v={{ default 1 .Values.groundctl.log_level }}\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/values.yaml",
"new_path": "charts/kubernikus/values.yaml",
"diff": "@@ -10,7 +10,6 @@ openstack:\nauth_project: \"master\"\nauth_project_domain: \"Default\"\n-kubernikus:\ndomain: \"kubernikus.replaceme.cloud.sap\"\napi:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | more confusion with values |
596,240 | 11.10.2017 10:20:32 | -7,200 | 14a5d0f449e3bd3161fcc736bd54a74f06935e7f | shorten node names | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -576,7 +576,7 @@ func (c *client) CreateNode(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.\nreturn \"\", err\n}\n- name := v1.SimpleNameGenerator.GenerateName(fmt.Sprintf(\"kubernikus-%v-%v-\", kluster.Spec.Name, pool.Name))\n+ name := v1.SimpleNameGenerator.GenerateName(fmt.Sprintf(\"%v-%v-\", kluster.Spec.Name, pool.Name))\nglog.V(5).Infof(\"Creating node %v\", name)\nserver, err := servers.Create(client, servers.CreateOpts{\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | shorten node names |
596,240 | 11.10.2017 11:25:54 | -7,200 | 3302f7c2457bd32cddd2b1ce8342bf7c14558e92 | filter on proper prefix | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -549,7 +549,7 @@ func (c *client) GetNodes(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.No\n}\nglog.V(5).Infof(\"Listing nodes for %v/%v\", project_id, pool_id)\n- prefix := fmt.Sprintf(\"kubernikus-%v-%v\", kluster.Spec.Name, pool_id)\n+ prefix := fmt.Sprintf(\"%v-%v\", kluster.Spec.Name, pool_id)\nopts := servers.ListOpts{Name: prefix}\nservers.List(client, opts).EachPage(func(page pagination.Page) (bool, error) {\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | filter on proper prefix |
596,240 | 11.10.2017 15:21:40 | -7,200 | e36c9da4ede5ccabfd5a867561128f35ce724948 | fix mtu trouble with DHCP | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -11,6 +11,18 @@ passwd:\nlocksmith:\nreboot_strategy: \"reboot\"\n+netowrkd:\n+ units:\n+ - name: 00-ens32.network\n+ contents: |\n+ [Match]\n+ Name=ens32\n+ [Network]\n+ DHCP=true\n+ [DHCP]\n+ UseMTU=true\n+ CriticalConnection=true\n+\nsystemd:\nunits:\n- name: ccloud-metadata.service\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fix mtu trouble with DHCP |
596,240 | 11.10.2017 17:43:02 | -7,200 | d2cb9900a8ebd946cd2fbbbd5e834aa07c10597a | new name for network cards | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -13,10 +13,10 @@ locksmith:\nnetworkd:\nunits:\n- - name: 00-ens32.network\n+ - name: 00-ens.network\ncontents: |\n[Match]\n- Name=ens32\n+ Name=ens*\n[Network]\nDHCP=true\n[DHCP]\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | new name for network cards |
596,240 | 12.10.2017 16:28:16 | -7,200 | fae57807c9e4864ca41cd02d3abfeb30c5b8a59f | detangles kubeconfig default loading | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -19,6 +19,7 @@ import (\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n\"k8s.io/client-go/tools/clientcmd\"\n+ clientcmdapi \"k8s.io/client-go/tools/clientcmd/api\"\n)\nfunc NewCredentialsCommand() *cobra.Command {\n@@ -47,6 +48,7 @@ type CredentialsOptions struct {\nauth *tokens.AuthOptions\nprovider *gophercloud.ProviderClient\nidentity *gophercloud.ServiceClient\n+ kubeconfig *clientcmdapi.Config\n}\nfunc NewCredentialsOptions() *CredentialsOptions {\n@@ -55,7 +57,10 @@ func NewCredentialsOptions() *CredentialsOptions {\nusername = os.Getenv(\"USER\")\n}\n- o := &CredentialsOptions{}\n+ o := &CredentialsOptions{\n+ name: os.Getenv(\"KUBERNIKUS_NAME\"),\n+ url: os.Getenv(\"KUBERNIKUS_URL\"),\n+ }\no.auth = &tokens.AuthOptions{\nIdentityEndpoint: os.Getenv(\"OS_AUTH_URL\"),\nUsername: username,\n@@ -68,9 +73,6 @@ func NewCredentialsOptions() *CredentialsOptions {\n},\n}\n- o.name = os.Getenv(\"KUBERNIKUS_NAME\")\n- o.url = os.Getenv(\"KUBERNIKUS_URL\")\n-\nreturn o\n}\n@@ -116,6 +118,11 @@ func (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\nfunc (o *CredentialsOptions) Complete(args []string) error {\nvar err error\n+ if err := o.setupKubeconfig(); err != nil {\n+ glog.V(2).Infof(\"%+v\", err)\n+ return errors.Errorf(\"No existing kubeconfig was found\")\n+ }\n+\nif err := o.setupOpenstackClients(); err != nil {\nglog.V(2).Infof(\"%+v\", err)\nreturn errors.Errorf(\"Openstack clients couldn't be created\")\n@@ -123,7 +130,7 @@ func (o *CredentialsOptions) Complete(args []string) error {\nfmt.Printf(\"Authenticating %v/%v at %v/%v\\n\", o.auth.DomainName, o.auth.Username, o.auth.Scope.DomainName, o.auth.Scope.ProjectName)\nif err := o.authenticate(); err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ glog.V(2).Infof(\"%#v\", err)\nreturn errors.Errorf(\"Authentication failed\")\n}\n@@ -181,6 +188,16 @@ func (o *CredentialsOptions) Run(c *cobra.Command) error {\nreturn nil\n}\n+func (o *CredentialsOptions) setupKubeconfig() error {\n+ var err error\n+\n+ if o.kubeconfig, err = clientcmd.NewDefaultPathOptions().GetStartingConfig(); err != nil {\n+ return errors.Wrap(err, \"Getting starting config failed\")\n+ }\n+\n+ return nil\n+}\n+\nfunc (o *CredentialsOptions) setupOpenstackClients() error {\nvar err error\n@@ -278,22 +295,17 @@ func (o *CredentialsOptions) autoDetectClusterName() (string, error) {\n}\nfunc (o *CredentialsOptions) mergeAndPersist(rawConfig string) error {\n- defaultPathOptions := clientcmd.NewDefaultPathOptions()\n- startingConfig, err := defaultPathOptions.GetStartingConfig()\n- if err != nil {\n- return errors.Wrap(err, \"Couldn't get existing kubeconfig\")\n- }\n-\nconfig, err := clientcmd.Load([]byte(rawConfig))\nif err != nil {\nreturn errors.Wrapf(err, \"Couldn't load kubernikus kubeconfig: %v\", rawConfig)\n}\n- if err := mergo.MergeWithOverwrite(startingConfig, config); err != nil {\n+ if err := mergo.MergeWithOverwrite(o.kubeconfig, config); err != nil {\nreturn errors.Wrap(err, \"Couldn't merge kubeconfigs\")\n}\n- if err = clientcmd.ModifyConfig(defaultPathOptions, *startingConfig, false); err != nil {\n+ defaultPathOptions := clientcmd.NewDefaultPathOptions()\n+ if err = clientcmd.ModifyConfig(defaultPathOptions, *o.kubeconfig, false); err != nil {\nreturn errors.Wrapf(err, \"Couldn't merge Kubernikus config with kubeconfig at %v:\", defaultPathOptions.GetDefaultFilename())\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | detangles kubeconfig default loading |
596,240 | 12.10.2017 16:35:30 | -7,200 | a1875a5c38057df7729b526c3500ef192029fc3a | creates dummy interface for kubernikus apiserver wormhole opening | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -123,7 +123,6 @@ systemd:\nDescription=Kube-Proxy\nRequires=network-online.target\nAfter=network-online.target\n-\n[Service]\nSlice=machine.slice\nExecStart=/usr/bin/rkt run \\\n@@ -145,10 +144,25 @@ systemd:\nKillMode=mixed\nRestart=always\nRestartSec=10s\n-\n[Install]\nWantedBy=multi-user.target\n+networkd:\n+ units:\n+ - name: 50-kubernikus.netdev\n+ contents: |\n+ [NetDev]\n+ Description=Kubernikus Dummy Interface\n+ Name=kubernikus\n+ Kind=dummy\n+ - name: 51-kubernikus.network\n+ contents: |\n+ [Match]\n+ Name=kubernikus\n+ [Network]\n+ DHCP=no\n+ Address=198.18.127.1/32\n+\nstorage:\nfiles:\n- path: /etc/kubernetes/certs/kubelet-clients-ca.pem\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | creates dummy interface for kubernikus apiserver wormhole opening |
596,240 | 12.10.2017 17:29:05 | -7,200 | d17eca4aceb40ee11a7beeccaa81f411b9ee8b8b | adds wormhole singularity to SANS | [
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground/certificates.go",
"new_path": "pkg/controller/ground/certificates.go",
"diff": "@@ -181,7 +181,7 @@ func (certs *Certificates) populateForSatellite(satellite string, config config.\ncerts.Kubelet.Clients.ApiServer = certs.signKubeletClient(\"apiserver\")\ncerts.TLS.ApiServer = certs.signTLS(\"apiserver\",\n[]string{\"kubernetes\", \"kubernetes.default\", \"apiserver\", satellite, fmt.Sprintf(\"%v.%v\", satellite, config.Kubernikus.Domain)},\n- []net.IP{net.IPv4(127, 0, 0, 1), net.IPv4(127, 0, 0, 5)})\n+ []net.IP{net.IPv4(127, 0, 0, 1), net.IPv4(198, 18, 128, 1)})\ncerts.TLS.Wormhole = certs.signTLS(\"wormhole\",\n[]string{fmt.Sprintf(\"%v-wormhole.%v\", satellite, config.Kubernikus.Domain)}, []net.IP{})\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds wormhole singularity to SANS |
596,240 | 12.10.2017 17:42:33 | -7,200 | 5817c4960f4389177f5e2bb5b81086019337f20a | locksteps kubernikus version | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/ignition.go",
"new_path": "pkg/templates/ignition.go",
"diff": "@@ -11,6 +11,7 @@ import (\n\"github.com/coreos/container-linux-config-transpiler/config/platform\"\n\"github.com/golang/glog\"\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n+ \"github.com/sapcc/kubernikus/pkg/version\"\nmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n\"k8s.io/client-go/kubernetes\"\n)\n@@ -46,12 +47,14 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nOpenstackRegion string\nOpenstackLBSubnetID string\nOpenstackRouterID string\n+ KubernikusImage string\n+ KubernikusImageTag string\n}{\nTLSCA: string(secret.Data[\"tls-ca.pem\"]),\nKubeletClientsCA: string(secret.Data[\"kubelet-clients-ca.pem\"]),\nApiserverClientsSystemKubeProxy: string(secret.Data[\"apiserver-clients-system-kube-proxy.pem\"]),\nApiserverClientsSystemKubeProxyKey: string(secret.Data[\"apiserver-clients-system-kube-proxy-key.pem\"]),\n- ClusterCIDR: \"10.180.128.0/17\",\n+ ClusterCIDR: \"198.19.0.0/16\",\nApiserverURL: kluster.Spec.KubernikusInfo.ServerURL,\nBootstrapToken: kluster.Spec.KubernikusInfo.BootstrapToken,\nOpenstackAuthURL: kluster.Spec.OpenstackInfo.AuthURL,\n@@ -61,6 +64,8 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nOpenstackRegion: kluster.Spec.OpenstackInfo.Region,\nOpenstackLBSubnetID: kluster.Spec.OpenstackInfo.LBSubnetID,\nOpenstackRouterID: kluster.Spec.OpenstackInfo.RouterID,\n+ KubernikusImage: \"sapcc/kubernikus\",\n+ KubernikusImageTag: version.VERSION,\n}\nvar buffer bytes.Buffer\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -92,7 +92,7 @@ systemd:\n[Service]\nSlice=machine.slice\n- ExecStartPre=/usr/bin/rkt fetch --insecure-options=image --pull-policy=new docker://sapcc/kubernikus:latest\n+ ExecStartPre=/usr/bin/rkt fetch --insecure-options=image --pull-policy=new docker://{{ .KubernikusImage }}:{{ .KubernikusImageTag }}\nExecStart=/usr/bin/rkt run \\\n--inherit-env \\\n--net=host \\\n@@ -103,7 +103,7 @@ systemd:\n--mount volume=var-run-kubernetes,target=/var/run/kubernetes \\\n--volume etc-kubernetes-certs,kind=host,source=/etc/kubernetes/certs,readOnly=true \\\n--mount volume=etc-kubernetes-certs,target=/etc/kubernetes/certs \\\n- docker://sapcc/kubernikus:latest \\\n+ docker://{{ .KubernikusImage }}:{{ .KubernikusImageTag }} \\\n--exec wormhole -- client --kubeconfig=/var/lib/kubelet/kubeconfig\nExecStopPost=/usr/bin/rkt gc --mark-only\nKillMode=mixed\n@@ -119,7 +119,7 @@ systemd:\n- name: kube-proxy.service\nenable: true\ncontents: |\n- [Unit]\n+ [Unit]}}\nDescription=Kube-Proxy\nRequires=network-online.target\nAfter=network-online.target\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | locksteps kubernikus version |
596,240 | 13.10.2017 10:16:52 | -7,200 | 78528540e40fd1dd4fc28c87d913f258208d5565 | namespaces users in kubeconfig by kluster-name to avoid clashes between regions | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/get_cluster_credentials.go",
"new_path": "pkg/api/handlers/get_cluster_credentials.go",
"diff": "@@ -2,6 +2,7 @@ package handlers\nimport (\n\"crypto/x509\"\n+ \"fmt\"\n\"time\"\n\"github.com/ghodss/yaml\"\n@@ -73,7 +74,7 @@ func (d *getClusterCredentials) Handle(params operations.GetClusterCredentialsPa\n})\nconfig := kubernetes.NewClientConfigV1(\nparams.Name,\n- principal.Name,\n+ fmt.Sprintf(\"%v@%v\", principal.Name, params.Name),\nkluster.Spec.KubernikusInfo.ServerURL,\ncertutil.EncodePrivateKeyPEM(cert.PrivateKey),\ncertutil.EncodeCertPEM(cert.Certificate),\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | namespaces users in kubeconfig by kluster-name to avoid clashes between regions |
596,240 | 13.10.2017 10:18:33 | -7,200 | 65f700ba1d93dbb100f505e49971496c3c2ff994 | puts nodes into the default security group by default | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -585,6 +585,7 @@ func (c *client) CreateNode(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.\nImageName: pool.Image,\nNetworks: []servers.Network{servers.Network{UUID: kluster.Spec.OpenstackInfo.NetworkID}},\nUserData: userData,\n+ SecurityGroups: []string{\"default\"},\nServiceClient: client,\n}).Extract()\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | puts nodes into the default security group by default |
596,240 | 13.10.2017 13:28:56 | -7,200 | e17c9c1bf1c6194be8e73c7d87375c47a07a878c | makes kubelet bootstrap reboot safe. fixes see also: | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -64,6 +64,7 @@ systemd:\nExecStartPre=/bin/mkdir -p /var/lib/cni\nExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/run/kubelet-pod.uuid\nExecStart=/usr/lib/coreos/kubelet-wrapper \\\n+ --cert-dir=/var/lib/kubelet/pki \\\n--cloud-config=/etc/kubernetes/openstack/openstack.config \\\n--cloud-provider=openstack \\\n--require-kubeconfig \\\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | makes kubelet bootstrap reboot safe. fixes #41. see also: https://github.com/kubernetes/kubernetes/pull/53317 |
596,240 | 13.10.2017 14:08:01 | -7,200 | 5eabddbb4ca779a95c5cfea674788ff41c50a564 | removes unneeded bind mount | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -99,8 +99,6 @@ systemd:\n--dns=host \\\n--volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=true \\\n--mount volume=var-lib-kubelet,target=/var/lib/kubelet \\\n- --volume var-run-kubernetes,kind=host,source=/var/run/kubernetes,readOnly=true \\\n- --mount volume=var-run-kubernetes,target=/var/run/kubernetes \\\n--volume etc-kubernetes-certs,kind=host,source=/etc/kubernetes/certs,readOnly=true \\\n--mount volume=etc-kubernetes-certs,target=/etc/kubernetes/certs \\\ndocker://{{ .KubernikusImage }}:{{ .KubernikusImageTag }} \\\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | removes unneeded bind mount |
596,240 | 13.10.2017 15:56:56 | -7,200 | 0c6909717ed3d6f64655e4237771f3ca482ada4c | makes domain a required value | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/templates/ingress.yaml",
"new_path": "charts/kubernikus/templates/ingress.yaml",
"diff": "@@ -9,9 +9,9 @@ metadata:\nspec:\ntls:\n- secretName: kubernikus-api\n- hosts: [{{.Values.domain}}]\n+ hosts: [{{ required \"domain missing\" .Values.domain }}]\nrules:\n- - host: {{.Values.domain}}\n+ - host: {{ required \"domain missing\" .Values.domain }}\nhttp:\npaths:\n- path: /\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus/values.yaml",
"new_path": "charts/kubernikus/values.yaml",
"diff": "@@ -10,8 +10,6 @@ openstack:\nauth_project: \"master\"\nauth_project_domain: \"Default\"\n-domain: \"kubernikus.replaceme.cloud.sap\"\n-\napi:\nport: 1234\nlog_level: 1\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | makes domain a required value |
596,240 | 13.10.2017 15:57:12 | -7,200 | 96ef689769895a34dcb12fc995ea0074576b09dd | turns eu-nl-1 virtual | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -251,9 +251,14 @@ jobs:\n- task: deploy\nfile: pipeline.git/ci/task_helm_kubernikus.yaml\nparams:\n- REGION: eu-nl-1\n- NAMESPACE: kube-system\n- GITHUB_TOKEN: ((github-access-token))\n+ OS_AUTH_URL: https://identity-3.eu-nl-1.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-eu-nl-1-username}}\n+ OS_PASSWORD: {{kubernikus-eu-nl-1-password}}\n+ OS_USER_DOMAIN_NAME: ccadmin\n+ OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_DOMAIN_NAME: ccadmin\n+ KUBERNIKUS_NAME: k-eu-nl-1\n+ KUBERNIKUS_URL: https://kubernikus-eu-nl-1.admin.cloud.sap\non_failure:\n<<: *post_failure_to_slack\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | turns eu-nl-1 virtual |
596,240 | 13.10.2017 16:23:28 | -7,200 | bec62565e4f230fe6b8fb6e937183f511afc25c4 | fix charts repo | [
{
"change_type": "MODIFY",
"old_path": "ci/task_helm_kubernikus-system.yaml",
"new_path": "ci/task_helm_kubernikus-system.yaml",
"diff": "@@ -8,7 +8,7 @@ image_resource:\ntag: 'latest'\ninputs:\n- - name: kubernikus.git\n+ - name: charts.git\n- name: secrets.git\nrun:\n@@ -18,8 +18,8 @@ run:\n- |\nset -exo pipefail\nkubernikusctl credentials\n- helm dep up --skip-refresh kubernikus.git/charts/kubernikus-system/\n- helm upgrade kubernikus-system kubernikus.git/charts/kubernikus-system/ --namespace=kubernikus-system--values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\n+ helm dep up --skip-refresh charts.git/charts/kubernikus-system/\n+ helm upgrade kubernikus-system charts.git/charts/kubernikus-system/ --namespace=kubernikus-system--values secrets.git/$KUBERNIKUS_NAME/values/kubernikus-system.yaml --install\nparams:\nOS_AUTH_URL:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fix charts repo |
596,240 | 13.10.2017 16:28:18 | -7,200 | f943ea869bb6e6e2a3380e20c87d2869a22bdded | hello kubernikus-system | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/Chart.yaml",
"diff": "+apiVersion: v1\n+description: Kubernikus System Components\n+name: kubernikus-system\n+version: 0.1.0\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/requirements.lock",
"diff": "+dependencies:\n+- name: nginx-ingress\n+ repository: https://kubernetes-charts.storage.googleapis.com\n+ version: 0.8.7\n+digest: sha256:bbd2e79fa3845cef0942523cd3faea7f002d4e9e6e073a39e34278cd65347e7a\n+generated: 2017-10-10T15:02:21.59991351+02:00\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/requirements.yaml",
"diff": "+dependencies:\n+ - name: nginx-ingress\n+ repository: https://kubernetes-charts.storage.googleapis.com\n+ version: 0.8.7\n+ condition: nginx-ingress.enabled\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/values.yaml",
"diff": "+nginx-ingress:\n+ enabled: true\n+ rbac:\n+ create: true\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/Chart.yaml",
"diff": "+apiVersion: v1\n+description: A Helm chart for Kubernetes\n+name: vice-president\n+version: 0.1.0\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/templates/_helpers.tpl",
"diff": "+{{/* vim: set filetype=mustache: */}}\n+{{/*\n+Expand the name of the chart.\n+*/}}\n+{{- define \"name\" -}}\n+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix \"-\" -}}\n+{{- end -}}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/templates/config.yaml",
"diff": "+{{- if .Values.vice }}\n+apiVersion: v1\n+kind: ConfigMap\n+metadata:\n+ name: {{ template \"name\" . }}\n+\n+data:\n+ vice-president.conf: |\n+ vice:\n+ first_name: {{ .Values.vice.first_name | quote }}\n+ last_name: {{ .Values.vice.last_name | quote }}\n+ email: {{ .Values.vice.email | quote }}\n+ country: {{ .Values.vice.country | quote }}\n+ province: {{ .Values.vice.province | quote }}\n+ locality: {{ .Values.vice.locality | quote }}\n+ organization: {{ .Values.vice.organization | quote }}\n+ organizational_unit: {{ .Values.vice.organizational_unit | quote }}\n+ default_challenge: {{ .Values.vice.default_challenge | quote }}\n+{{- end}}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/templates/deployment.yaml",
"diff": "+{{- if .Values.vice }}\n+apiVersion: extensions/v1beta1\n+kind: Deployment\n+metadata:\n+ name: {{ template \"name\" . }}\n+ namespace: kube-system\n+ labels:\n+ app: {{ template \"name\" . }}\n+\n+spec:\n+ replicas: 1\n+ template:\n+ metadata:\n+ labels:\n+ app: {{ template \"name\" . }}\n+ annotations:\n+ prometheus.io/scrape: 'true'\n+ prometheus.io/port: {{ .Values.metrics_port | quote }}\n+ spec:\n+ containers:\n+ - name: {{ .Chart.Name }}\n+ image: \"{{ .Values.image.repository }}:{{ .Values.image.tag }}\"\n+ imagePullPolicy: {{ .Values.image.pullPolicy }}\n+ args:\n+ - vice-president\n+ - --vice-president-config=/etc/vice-president/config/vice-president.conf\n+ - --vice-cert=/etc/vice-president/secrets/vice.cert\n+ - --vice-key=/etc/vice-president/secrets/vice.key\n+ - --intermediate-cert=/etc/vice-president/secrets/intermediate.cert\n+ - --metric-listen-address=:{{.Values.metrics_port}}\n+ - --v={{ default 1 .Values.log_level }}\n+ volumeMounts:\n+ - name: config\n+ mountPath: /etc/vice-president/config\n+ - name: certs\n+ mountPath: /etc/vice-president/secrets\n+ ports:\n+ - name: metrics\n+ containerPort: {{ .Values.metrics_port }}\n+ volumes:\n+ - name: config\n+ configMap:\n+ name: {{ template \"name\" . }}\n+ - name: certs\n+ secret:\n+ secretName: {{ template \"name\" . }}\n+{{- end}}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/templates/secret.yaml",
"diff": "+{{- if .Values.vice }}\n+apiVersion: v1\n+kind: Secret\n+type: Opaque\n+\n+metadata:\n+ name: {{ template \"name\" . }}\n+\n+data:\n+ vice.cert: {{ default \"\" .Values.vice.cert | b64enc | quote }}\n+ vice.key: {{ default \"\" .Values.vice.key | b64enc | quote }}\n+ intermediate.cert: {{ default \"\" .Values.vice.intermediate | b64enc | quote }}\n+{{- end }}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "charts/kubernikus-system/vice-president/values.yaml",
"diff": "+image:\n+ repository: sapcc/vice-president\n+ tag: v201710111351\n+ pullPolicy: IfNotPresent\n+log_level: 1\n+metrics_port: 9091\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | hello kubernikus-system |
596,240 | 13.10.2017 16:40:12 | -7,200 | d431ee380f456ffaf2b806acd31a56fba3a726d9 | needs to pick up namespace from helm | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus-system/charts/vice-president/templates/deployment.yaml",
"new_path": "charts/kubernikus-system/charts/vice-president/templates/deployment.yaml",
"diff": "@@ -3,7 +3,6 @@ apiVersion: extensions/v1beta1\nkind: Deployment\nmetadata:\nname: {{ template \"name\" . }}\n- namespace: kube-system\nlabels:\napp: {{ template \"name\" . }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | needs to pick up namespace from helm |
596,240 | 13.10.2017 16:45:08 | -7,200 | b67bba0b3698a9993accf049e4a0cdc941f4ee42 | vendors vice-president | [
{
"change_type": "MODIFY",
"old_path": "charts/kubernikus-system/requirements.yaml",
"new_path": "charts/kubernikus-system/requirements.yaml",
"diff": "@@ -3,3 +3,6 @@ dependencies:\nrepository: https://kubernetes-charts.storage.googleapis.com\nversion: 0.8.7\ncondition: nginx-ingress.enabled\n+ - name: vice-president\n+ repository: file://vendor/vice-president\n+ version: 0.1.0\n"
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/Chart.yaml",
"new_path": "charts/kubernikus-system/vendor/vice-president/Chart.yaml",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/templates/_helpers.tpl",
"new_path": "charts/kubernikus-system/vendor/vice-president/templates/_helpers.tpl",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/templates/config.yaml",
"new_path": "charts/kubernikus-system/vendor/vice-president/templates/config.yaml",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/templates/deployment.yaml",
"new_path": "charts/kubernikus-system/vendor/vice-president/templates/deployment.yaml",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/templates/secret.yaml",
"new_path": "charts/kubernikus-system/vendor/vice-president/templates/secret.yaml",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "charts/kubernikus-system/charts/vice-president/values.yaml",
"new_path": "charts/kubernikus-system/vendor/vice-president/values.yaml",
"diff": ""
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | vendors vice-president |
596,240 | 13.10.2017 16:51:16 | -7,200 | bc3c3eac1e356cf3b77bc7c73dd1449d9496e7da | now using correct auth-url | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -364,11 +364,11 @@ jobs:\n- task: deploy\nfile: pipeline.git/ci/task_helm_kubernikus-system.yaml\nparams:\n- OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n- OS_USERNAME: {{kubernikus-staging-username}}\n- OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_AUTH_URL: https://identity-3.eu-nl-1.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-eu-nl-1-username}}\n+ OS_PASSWORD: {{kubernikus-eu-nl-1-password}}\nOS_USER_DOMAIN_NAME: ccadmin\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-eu-nl-1\n- KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n+ KUBERNIKUS_URL: https://kubernikus-eu-nl-1.admin.cloud.sap\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | now using correct auth-url |
596,240 | 16.10.2017 13:24:06 | -7,200 | acda89e3d3348e8b63af89ff96a951bd13b5dce1 | seeds kube-dns as part of cluster bootstrap | [
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground/bootstrap.go",
"new_path": "pkg/controller/ground/bootstrap.go",
"diff": "@@ -3,6 +3,7 @@ package ground\nimport (\n\"fmt\"\n+ \"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/dns\"\napierrors \"k8s.io/apimachinery/pkg/api/errors\"\nmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\nclientset \"k8s.io/client-go/kubernetes\"\n@@ -23,6 +24,9 @@ func SeedKluster(client clientset.Interface) error {\nif err := SeedCinderStorageClass(client); err != nil {\nreturn err\n}\n+ if err := dns.SeedKubeDNS(client, \"\", \"\", \"\", \"\"); err != nil {\n+ return err\n+ }\nreturn nil\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/controller/ground/bootstrap/dns/dns.go",
"diff": "+package dns\n+\n+import (\n+ \"bytes\"\n+ \"fmt\"\n+ \"html/template\"\n+\n+ apierrors \"k8s.io/apimachinery/pkg/api/errors\"\n+ metav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n+ \"k8s.io/apimachinery/pkg/runtime\"\n+ clientset \"k8s.io/client-go/kubernetes\"\n+ \"k8s.io/client-go/pkg/api\"\n+ \"k8s.io/client-go/pkg/api/v1\"\n+ apps \"k8s.io/client-go/pkg/apis/apps/v1beta1\"\n+)\n+\n+const (\n+ SERVICE_ACCOUNT = \"kube-dns\"\n+ DEFAULT_REPOSITORY = \"gcr.io/google_containers\"\n+ DEFAULT_VERSION = \"1.14.5\"\n+ DEFAULT_DOMAIN = \"cluster.local\"\n+ DEFAULT_CLUSTER_IP = \"198.18.254.254\"\n+)\n+\n+type DeploymentOptions struct {\n+ Repository string\n+ Version string\n+ Domain string\n+}\n+\n+type ServiceOptions struct {\n+ ClusterIP string\n+}\n+\n+func SeedKubeDNS(client clientset.Interface, repository, version, domain, clusterIP string) error {\n+ if repository == \"\" {\n+ repository = DEFAULT_REPOSITORY\n+ }\n+\n+ if version == \"\" {\n+ version = DEFAULT_VERSION\n+ }\n+\n+ if domain == \"\" {\n+ domain = DEFAULT_DOMAIN\n+ }\n+\n+ if clusterIP == \"\" {\n+ clusterIP = DEFAULT_CLUSTER_IP\n+ }\n+\n+ if err := createKubeDNSServiceAccount(client); err != nil {\n+ return err\n+ }\n+\n+ if err := createKubeDNSDeployment(client, repository, version, domain); err != nil {\n+ return err\n+ }\n+\n+ if err := createKubeDNSService(client, clusterIP); err != nil {\n+ return err\n+ }\n+\n+ return nil\n+}\n+\n+func createKubeDNSServiceAccount(client clientset.Interface) error {\n+ return CreateOrUpdateServiceAccount(client, &v1.ServiceAccount{\n+ ObjectMeta: metav1.ObjectMeta{\n+ Name: SERVICE_ACCOUNT,\n+ Namespace: metav1.NamespaceSystem,\n+ },\n+ })\n+}\n+\n+func createKubeDNSDeployment(client clientset.Interface, repository, version, domain string) error {\n+ options := &DeploymentOptions{\n+ Repository: repository,\n+ Version: version,\n+ Domain: domain,\n+ }\n+\n+ deployment, err := getKubeDNSDeployment(options)\n+ if err != nil {\n+ return err\n+ }\n+\n+ if err := CreateOrUpdateDeployment(client, deployment); err != nil {\n+ return err\n+ }\n+\n+ return nil\n+}\n+\n+func createKubeDNSService(client clientset.Interface, clusterIP string) error {\n+ options := &ServiceOptions{\n+ ClusterIP: clusterIP,\n+ }\n+\n+ service, err := getKubeDNSService(options)\n+ if err != nil {\n+ return err\n+ }\n+\n+ if err := CreateOrUpdateService(client, service); err != nil {\n+ return err\n+ }\n+\n+ return nil\n+}\n+\n+func getKubeDNSDeployment(options *DeploymentOptions) (*apps.Deployment, error) {\n+ manifest := KubeDNSDeployment_v20171016\n+ deployment := &apps.Deployment{}\n+\n+ template, err := RenderManifest(manifest, options)\n+ if err != nil {\n+ return nil, err\n+ }\n+\n+ if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), template, deployment); err != nil {\n+ return nil, err\n+ }\n+\n+ return deployment, nil\n+}\n+\n+func getKubeDNSService(options *ServiceOptions) (*v1.Service, error) {\n+ manifest := KubeDNSService_v20171016\n+ service := &v1.Service{}\n+\n+ template, err := RenderManifest(manifest, options)\n+ if err != nil {\n+ return nil, err\n+ }\n+\n+ if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), template, service); err != nil {\n+ return nil, err\n+ }\n+\n+ return service, nil\n+}\n+\n+func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAccount) error {\n+ if _, err := client.CoreV1().ServiceAccounts(sa.ObjectMeta.Namespace).Create(sa); err != nil {\n+ if !apierrors.IsAlreadyExists(err) {\n+ return fmt.Errorf(\"unable to create serviceaccount: %v\", err)\n+ }\n+ }\n+ return nil\n+}\n+\n+func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deployment) error {\n+ if _, err := client.AppsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Create(deploy); err != nil {\n+ if !apierrors.IsAlreadyExists(err) {\n+ return fmt.Errorf(\"unable to create deployment: %v\", err)\n+ }\n+\n+ if _, err := client.AppsV1beta1().Deployments(deploy.ObjectMeta.Namespace).Update(deploy); err != nil {\n+ return fmt.Errorf(\"unable to update deployment: %v\", err)\n+ }\n+ }\n+ return nil\n+}\n+\n+func CreateOrUpdateService(client clientset.Interface, service *v1.Service) error {\n+ if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Create(service); err != nil {\n+ if !apierrors.IsAlreadyExists(err) && !apierrors.IsInvalid(err) {\n+ return fmt.Errorf(\"unable to create a new kube-dns service: %v\", err)\n+ }\n+\n+ if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Update(service); err != nil {\n+ return fmt.Errorf(\"unable to create/update the kube-dns service: %v\", err)\n+ }\n+ }\n+ return nil\n+}\n+\n+func RenderManifest(strtmpl string, obj interface{}) ([]byte, error) {\n+ var buf bytes.Buffer\n+ tmpl, err := template.New(\"template\").Parse(strtmpl)\n+ if err != nil {\n+ return nil, fmt.Errorf(\"error when parsing template: %v\", err)\n+ }\n+ err = tmpl.Execute(&buf, obj)\n+ if err != nil {\n+ return nil, fmt.Errorf(\"error when executing template: %v\", err)\n+ }\n+ return buf.Bytes(), nil\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/controller/ground/bootstrap/dns/manifests.go",
"diff": "+package dns\n+\n+const (\n+ KubeDNSDeployment_v20171016 = `\n+apiVersion: extensions/v1beta1\n+kind: Deployment\n+metadata:\n+ name: kube-dns\n+ namespace: kube-system\n+ labels:\n+ k8s-app: kube-dns\n+ kubernetes.io/cluster-service: \"true\"\n+ addonmanager.kubernetes.io/mode: Reconcile\n+spec:\n+ # replicas: not specified here:\n+ # 1. In order to make Addon Manager do not reconcile this replicas parameter.\n+ # 2. Default is 1.\n+ # 3. Will be tuned in real time if DNS horizontal auto-scaling is turned on.\n+ strategy:\n+ rollingUpdate:\n+ maxSurge: 10%\n+ maxUnavailable: 0\n+ selector:\n+ matchLabels:\n+ k8s-app: kube-dns\n+ template:\n+ metadata:\n+ labels:\n+ k8s-app: kube-dns\n+ annotations:\n+ scheduler.alpha.kubernetes.io/critical-pod: ''\n+ spec:\n+ tolerations:\n+ - key: \"CriticalAddonsOnly\"\n+ operator: \"Exists\"\n+ volumes:\n+ - name: kube-dns-config\n+ configMap:\n+ name: kube-dns\n+ optional: true\n+ containers:\n+ - name: kubedns\n+ image: {{ .Repository }}/k8s-dns-kube-dns-amd64:{{ .Version }}\n+ resources:\n+ # TODO: Set memory limits when we've profiled the container for large\n+ # clusters, then set request = limit to keep this container in\n+ # guaranteed class. Currently, this container falls into the\n+ # \"burstable\" category so the kubelet doesn't backoff from restarting it.\n+ limits:\n+ memory: 170Mi\n+ requests:\n+ cpu: 100m\n+ memory: 70Mi\n+ livenessProbe:\n+ httpGet:\n+ path: /healthcheck/kubedns\n+ port: 10054\n+ scheme: HTTP\n+ initialDelaySeconds: 60\n+ timeoutSeconds: 5\n+ successThreshold: 1\n+ failureThreshold: 5\n+ readinessProbe:\n+ httpGet:\n+ path: /readiness\n+ port: 8081\n+ scheme: HTTP\n+ # we poll on pod startup for the Kubernetes master service and\n+ # only setup the /readiness HTTP server once that's available.\n+ initialDelaySeconds: 3\n+ timeoutSeconds: 5\n+ args:\n+ - --domain={{ .Domain }}.\n+ - --dns-port=10053\n+ - --config-dir=/kube-dns-config\n+ - --v=2\n+ env:\n+ - name: PROMETHEUS_PORT\n+ value: \"10055\"\n+ ports:\n+ - containerPort: 10053\n+ name: dns-local\n+ protocol: UDP\n+ - containerPort: 10053\n+ name: dns-tcp-local\n+ protocol: TCP\n+ - containerPort: 10055\n+ name: metrics\n+ protocol: TCP\n+ volumeMounts:\n+ - name: kube-dns-config\n+ mountPath: /kube-dns-config\n+ - name: dnsmasq\n+ image: {{ .Repository }}/k8s-dns-dnsmasq-nanny-amd64:{{ .Version }}\n+ livenessProbe:\n+ httpGet:\n+ path: /healthcheck/dnsmasq\n+ port: 10054\n+ scheme: HTTP\n+ initialDelaySeconds: 60\n+ timeoutSeconds: 5\n+ successThreshold: 1\n+ failureThreshold: 5\n+ args:\n+ - -v=2\n+ - -logtostderr\n+ - -configDir=/etc/k8s/dns/dnsmasq-nanny\n+ - -restartDnsmasq=true\n+ - --\n+ - -k\n+ - --cache-size=1000\n+ - --no-negcache\n+ - --log-facility=-\n+ - --server=/{{ .Domain }}/127.0.0.1#10053\n+ - --server=/in-addr.arpa/127.0.0.1#10053\n+ - --server=/ip6.arpa/127.0.0.1#10053\n+ ports:\n+ - containerPort: 53\n+ name: dns\n+ protocol: UDP\n+ - containerPort: 53\n+ name: dns-tcp\n+ protocol: TCP\n+ # see: https://github.com/kubernetes/kubernetes/issues/29055 for details\n+ resources:\n+ requests:\n+ cpu: 150m\n+ memory: 20Mi\n+ volumeMounts:\n+ - name: kube-dns-config\n+ mountPath: /etc/k8s/dns/dnsmasq-nanny\n+ - name: sidecar\n+ image: {{ .Repository }}/k8s-dns-sidecar-amd64:{{ .Version }}\n+ livenessProbe:\n+ httpGet:\n+ path: /metrics\n+ port: 10054\n+ scheme: HTTP\n+ initialDelaySeconds: 60\n+ timeoutSeconds: 5\n+ successThreshold: 1\n+ failureThreshold: 5\n+ args:\n+ - --v=2\n+ - --logtostderr\n+ - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ .Domain }},5,A\n+ - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ .Domain }},5,A\n+ ports:\n+ - containerPort: 10054\n+ name: metrics\n+ protocol: TCP\n+ resources:\n+ requests:\n+ memory: 20Mi\n+ cpu: 10m\n+ dnsPolicy: Default # Don't use cluster DNS.\n+ serviceAccountName: kube-dns\n+`\n+\n+ // KubeDNSService is the kube-dns Service manifest\n+ KubeDNSService_v20171016 = `\n+apiVersion: v1\n+kind: Service\n+metadata:\n+ labels:\n+ k8s-app: kube-dns\n+ kubernetes.io/cluster-service: \"true\"\n+ kubernetes.io/name: \"KubeDNS\"\n+ name: kube-dns\n+ namespace: kube-system\n+ # Without this resourceVersion value, an update of the Service between versions will yield:\n+ # Service \"kube-dns\" is invalid: metadata.resourceVersion: Invalid value: \"\": must be specified for an update\n+ resourceVersion: \"0\"\n+spec:\n+ clusterIP: {{ .ClusterIP }}\n+ ports:\n+ - name: dns\n+ port: 53\n+ protocol: UDP\n+ targetPort: 53\n+ - name: dns-tcp\n+ port: 53\n+ protocol: TCP\n+ targetPort: 53\n+ selector:\n+ k8s-app: kube-dns\n+`\n+)\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | seeds kube-dns as part of cluster bootstrap |
596,240 | 16.10.2017 13:24:30 | -7,200 | 587d89e08e8dd40a93b7c5c64c42edc67d9e5530 | allows to ommit kubeconfig context | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/kubernetes/client.go",
"new_path": "pkg/client/kubernetes/client.go",
"diff": "@@ -91,7 +91,11 @@ func (f *SharedClientFactory) ClientFor(k *kubernikus_v1.Kluster) (kubernetes.In\nfunc NewConfig(kubeconfig, context string) (*rest.Config, error) {\nrules := clientcmd.NewDefaultClientConfigLoadingRules()\n- overrides := &clientcmd.ConfigOverrides{CurrentContext: context}\n+ overrides := &clientcmd.ConfigOverrides{}\n+\n+ if len(context) > 0 {\n+ overrides.CurrentContext = context\n+ }\nif len(kubeconfig) > 0 {\nrules.ExplicitPath = kubeconfig\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | allows to ommit kubeconfig context |
596,240 | 16.10.2017 13:25:32 | -7,200 | 029161e14cefb2411cf551a275a96b512e54469e | adds seed command that allows to repeat seeds for existing clusters | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/kubernikus.go",
"new_path": "pkg/cmd/kubernikus/kubernikus.go",
"diff": "@@ -17,6 +17,7 @@ func NewCommand(name string) *cobra.Command {\nNewCertificatesCommand(),\nNewHelmCommand(),\nNewOperatorCommand(),\n+ NewSeedCommand(),\n)\nc.PersistentFlags().AddGoFlagSet(flag.CommandLine)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/cmd/kubernikus/seed.go",
"diff": "+package kubernikus\n+\n+import (\n+ \"github.com/sapcc/kubernikus/pkg/cmd/kubernikus/seed\"\n+ \"github.com/spf13/cobra\"\n+)\n+\n+func NewSeedCommand() *cobra.Command {\n+ c := &cobra.Command{\n+ Use: \"seed\",\n+ Short: \"Seed stuff\",\n+ }\n+\n+ c.AddCommand(\n+ seed.NewKubeDNSCommand(),\n+ )\n+\n+ return c\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/cmd/kubernikus/seed/dns.go",
"diff": "+package seed\n+\n+import (\n+ \"github.com/sapcc/kubernikus/pkg/client/kubernetes\"\n+ \"github.com/sapcc/kubernikus/pkg/cmd\"\n+ \"github.com/sapcc/kubernikus/pkg/controller/ground/bootstrap/dns\"\n+ \"github.com/spf13/cobra\"\n+ \"github.com/spf13/pflag\"\n+)\n+\n+func NewKubeDNSCommand() *cobra.Command {\n+ o := NewKubeDNSOptions()\n+\n+ c := &cobra.Command{\n+ Use: \"dns\",\n+ Short: \"Seeds the kube-dns addon\",\n+ Run: func(c *cobra.Command, args []string) {\n+ cmd.CheckError(o.Validate(c, args))\n+ cmd.CheckError(o.Complete(args))\n+ cmd.CheckError(o.Run(c))\n+ },\n+ }\n+\n+ o.BindFlags(c.Flags())\n+\n+ return c\n+}\n+\n+type KubeDNSOptions struct {\n+ kubeConfig string\n+ context string\n+ repository string\n+ version string\n+ domain string\n+ clusterIP string\n+}\n+\n+func NewKubeDNSOptions() *KubeDNSOptions {\n+ return &KubeDNSOptions{\n+ repository: dns.DEFAULT_REPOSITORY,\n+ version: dns.DEFAULT_VERSION,\n+ domain: dns.DEFAULT_DOMAIN,\n+ clusterIP: dns.DEFAULT_CLUSTER_IP,\n+ }\n+}\n+\n+func (o *KubeDNSOptions) BindFlags(flags *pflag.FlagSet) {\n+ flags.StringVar(&o.kubeConfig, \"kubeconfig\", o.kubeConfig, \"Path to kubeconfig file with authorization information\")\n+ flags.StringVar(&o.context, \"context\", o.context, \"Overwrite the current-context in kubeconfig\")\n+ flags.StringVar(&o.repository, \"repository\", o.repository, \"Docker repository for kube-dns containers\")\n+ flags.StringVar(&o.version, \"version\", o.version, \"Version tag for kube-dns containers\")\n+ flags.StringVar(&o.domain, \"domain\", o.domain, \"Cluster Domain\")\n+ flags.StringVar(&o.clusterIP, \"cluster-ip\", o.clusterIP, \"ClusterIP for kube-dns service\")\n+}\n+\n+func (o *KubeDNSOptions) Validate(c *cobra.Command, args []string) error {\n+ return nil\n+}\n+\n+func (o *KubeDNSOptions) Complete(args []string) error {\n+ return nil\n+}\n+\n+func (o *KubeDNSOptions) Run(c *cobra.Command) error {\n+ client, err := kubernetes.NewClient(o.kubeConfig, o.context)\n+ if err != nil {\n+ return err\n+ }\n+\n+ if err = dns.SeedKubeDNS(client, o.repository, o.version, o.domain, o.clusterIP); err != nil {\n+ return err\n+ }\n+\n+ return nil\n+}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | adds seed command that allows to repeat seeds for existing clusters |
596,240 | 16.10.2017 13:48:08 | -7,200 | de17f62e675e8a0a4e4191493e4c6ff8fb431555 | ensures kube-dns configmap exists | [
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground/bootstrap/dns/dns.go",
"new_path": "pkg/controller/ground/bootstrap/dns/dns.go",
"diff": "@@ -16,6 +16,7 @@ import (\nconst (\nSERVICE_ACCOUNT = \"kube-dns\"\n+ CONFIGMAP = \"kube-dns\"\nDEFAULT_REPOSITORY = \"gcr.io/google_containers\"\nDEFAULT_VERSION = \"1.14.5\"\nDEFAULT_DOMAIN = \"cluster.local\"\n@@ -53,6 +54,10 @@ func SeedKubeDNS(client clientset.Interface, repository, version, domain, cluste\nreturn err\n}\n+ if err := createKubeDNSConfigMap(client); err != nil {\n+ return err\n+ }\n+\nif err := createKubeDNSDeployment(client, repository, version, domain); err != nil {\nreturn err\n}\n@@ -69,6 +74,22 @@ func createKubeDNSServiceAccount(client clientset.Interface) error {\nObjectMeta: metav1.ObjectMeta{\nName: SERVICE_ACCOUNT,\nNamespace: metav1.NamespaceSystem,\n+ Labels: map[string]string{\n+ \"kubernetes.io/cluster-service\": \"true\",\n+ \"addonmanager.kubernetes.io/mode\": \"Reconcile\",\n+ },\n+ },\n+ })\n+}\n+\n+func createKubeDNSConfigMap(client clientset.Interface) error {\n+ return CreateOrUpdateConfigMap(client, &v1.ConfigMap{\n+ ObjectMeta: metav1.ObjectMeta{\n+ Name: CONFIGMAP,\n+ Namespace: metav1.NamespaceSystem,\n+ Labels: map[string]string{\n+ \"addonmanager.kubernetes.io/mode\": \"EnsureExists\",\n+ },\n},\n})\n}\n@@ -176,6 +197,19 @@ func CreateOrUpdateService(client clientset.Interface, service *v1.Service) erro\nreturn nil\n}\n+func CreateOrUpdateConfigMap(client clientset.Interface, configmap *v1.ConfigMap) error {\n+ if _, err := client.CoreV1().ConfigMaps(configmap.ObjectMeta.Namespace).Create(configmap); err != nil {\n+ if !apierrors.IsAlreadyExists(err) {\n+ return fmt.Errorf(\"unable to create configmap: %v\", err)\n+ }\n+\n+ if _, err := client.CoreV1().ConfigMaps(configmap.ObjectMeta.Namespace).Update(configmap); err != nil {\n+ return fmt.Errorf(\"unable to update configmap: %v\", err)\n+ }\n+ }\n+ return nil\n+}\n+\nfunc RenderManifest(strtmpl string, obj interface{}) ([]byte, error) {\nvar buf bytes.Buffer\ntmpl, err := template.New(\"template\").Parse(strtmpl)\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground/bootstrap/dns/manifests.go",
"new_path": "pkg/controller/ground/bootstrap/dns/manifests.go",
"diff": "@@ -162,27 +162,26 @@ spec:\napiVersion: v1\nkind: Service\nmetadata:\n+ name: kube-dns\n+ namespace: kube-system\nlabels:\nk8s-app: kube-dns\nkubernetes.io/cluster-service: \"true\"\n+ addonmanager.kubernetes.io/mode: Reconcile\nkubernetes.io/name: \"KubeDNS\"\n- name: kube-dns\n- namespace: kube-system\n# Without this resourceVersion value, an update of the Service between versions will yield:\n# Service \"kube-dns\" is invalid: metadata.resourceVersion: Invalid value: \"\": must be specified for an update\nresourceVersion: \"0\"\nspec:\n+ selector:\n+ k8s-app: kube-dns\nclusterIP: {{ .ClusterIP }}\nports:\n- name: dns\nport: 53\nprotocol: UDP\n- targetPort: 53\n- name: dns-tcp\nport: 53\nprotocol: TCP\n- targetPort: 53\n- selector:\n- k8s-app: kube-dns\n`\n)\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | ensures kube-dns configmap exists |
596,240 | 16.10.2017 13:52:51 | -7,200 | 62bbba417714e38afb10afb2377e1be9df105abf | includes cluster-domain and cluster-dns into kubelet config
fixes | [
{
"change_type": "MODIFY",
"old_path": "pkg/templates/ignition.go",
"new_path": "pkg/templates/ignition.go",
"diff": "@@ -37,6 +37,8 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nKubeletClientsCA string\nApiserverClientsSystemKubeProxy string\nApiserverClientsSystemKubeProxyKey string\n+ ClusterDomain string\n+ ClusterDNS string\nClusterCIDR string\nApiserverURL string\nBootstrapToken string\n@@ -55,6 +57,8 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nApiserverClientsSystemKubeProxy: string(secret.Data[\"apiserver-clients-system-kube-proxy.pem\"]),\nApiserverClientsSystemKubeProxyKey: string(secret.Data[\"apiserver-clients-system-kube-proxy-key.pem\"]),\nClusterCIDR: \"198.19.0.0/16\",\n+ ClusterDNS: \"198.18.254.254\",\n+ ClusterDomain: \"cluster.local\",\nApiserverURL: kluster.Spec.KubernikusInfo.ServerURL,\nBootstrapToken: kluster.Spec.KubernikusInfo.BootstrapToken,\nOpenstackAuthURL: kluster.Spec.OpenstackInfo.AuthURL,\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -74,7 +74,8 @@ systemd:\n--exit-on-lock-contention \\\n--pod-manifest-path=/etc/kubernetes/manifests \\\n--allow-privileged \\\n- --cluster_domain=cluster.local \\\n+ --cluster-dns={{ .ClusterDNS }} \\\n+ --cluster-domain={{ .ClusterDomain }} \\\n--client-ca-file=/etc/kubernetes/certs/kubelet-clients-ca.pem \\\n--non-masquerade-cidr={{ .ClusterCIDR }} \\\n--anonymous-auth=false\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | includes cluster-domain and cluster-dns into kubelet config
fixes #70 |
596,240 | 17.10.2017 09:46:05 | -7,200 | 63e68ffaa03ebe4ccffc8c9151558c2196c65d28 | externalizes kluster to helm value conversion | [
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/v1/kluster.go",
"new_path": "pkg/apis/kubernikus/v1/kluster.go",
"diff": "package v1\nimport (\n- yaml \"gopkg.in/yaml.v2\"\nmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n)\n-\n-\ntype NodePoolConfig struct {\nUpgrade bool `json:\"upgrade\"`\nRepair bool `json:\"repair\"`\n@@ -108,47 +105,3 @@ func (spec KlusterSpec) Validate() error {\nfunc (spec Kluster) Account() string {\nreturn spec.ObjectMeta.Labels[\"account\"]\n}\n-\n-func (kluster Kluster) ToHelmValues() ([]byte, error) {\n- type Values struct {\n- Kubernikus struct {\n- BoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n- }\n- Openstack struct {\n- AuthURL string `yaml:\"authURL\"`\n- Username string `yaml:\"username\"`\n- Password string `yaml:\"password\"`\n- DomainName string `yaml:\"domainName\"`\n- ProjectID string `yaml:\"projectID\"`\n- Region string `yaml:\"Region\"`\n- LbSubnetID string `yaml:\"lbSubnetID\"`\n- RouterID string `yaml:\"routerID\"`\n- }\n- Certs map[string]string `yaml:\"certs,omitempty\"`\n- ClusterCIDR string `yaml:\"clusterCIDR,omitempty\"`\n- ServiceCIDR string `yaml:\"serviceCIDR,omitempty\"`\n- AdvertiseAddress string `yaml:\"advertiseAddress,omitempty\"`\n- }\n-\n- values := Values{}\n- values.Kubernikus.BoostrapToken = kluster.Secret.BootstrapToken\n- values.Openstack.AuthURL = kluster.Spec.Openstack.AuthURL\n- values.Openstack.Username = kluster.Spec.Openstack.Username\n- values.Openstack.Password = kluster.Secret.Openstack.Password\n- values.Openstack.DomainName = kluster.Spec.Openstack.Domain\n- values.Openstack.ProjectID = kluster.Spec.Openstack.ProjectID\n- values.Openstack.Region = kluster.Spec.Openstack.Region\n- values.Openstack.LbSubnetID = kluster.Spec.Openstack.LBSubnetID\n- values.Openstack.RouterID = kluster.Spec.Openstack.RouterID\n- values.Certs = kluster.Secret.Certificates\n- values.ClusterCIDR = kluster.Spec.ClusterCIDR\n- values.ServiceCIDR = kluster.Spec.ServiceCIDR\n- values.AdvertiseAddress = kluster.Spec.AdvertiseAddress\n-\n- result, err := yaml.Marshal(values)\n- if err != nil {\n- return nil, err\n- }\n-\n- return result, nil\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -10,6 +10,7 @@ import (\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n\"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ \"github.com/sapcc/kubernikus/pkg/util/helm\"\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n)\n@@ -101,7 +102,7 @@ func (o *HelmOptions) Run(c *cobra.Command) error {\nground.CreateCertificates(kluster, nameA[1])\n- result, err := kluster.ToHelmValues()\n+ result, err := helm.KlusterToHelmValues(kluster)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -11,7 +11,6 @@ import (\n\"github.com/Masterminds/goutils\"\n\"github.com/golang/glog\"\n\"google.golang.org/grpc\"\n- yaml \"gopkg.in/yaml.v2\"\nmetav1 \"k8s.io/apimachinery/pkg/apis/meta/v1\"\n\"k8s.io/apimachinery/pkg/util/wait\"\napi_v1 \"k8s.io/client-go/pkg/api/v1\"\n@@ -23,6 +22,7 @@ import (\n\"github.com/sapcc/kubernikus/pkg/client/kubernetes\"\n\"github.com/sapcc/kubernikus/pkg/controller/config\"\n\"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ helm_util \"github.com/sapcc/kubernikus/pkg/util/helm\"\n)\nconst (\n@@ -279,7 +279,7 @@ func (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n}\n//Generate helm values from cluster struct\n- rawValues, err := yaml.Marshal(tpr)\n+ rawValues, err := helm_util.KlusterToHelmValues(tpr)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/util/helm/helm.go",
"diff": "+package helm\n+\n+import (\n+ \"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n+ yaml \"gopkg.in/yaml.v2\"\n+)\n+\n+func KlusterToHelmValues(kluster *v1.Kluster) ([]byte, error) {\n+ type Values struct {\n+ Kubernikus struct {\n+ BoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n+ }\n+ Openstack struct {\n+ AuthURL string `yaml:\"authURL\"`\n+ Username string `yaml:\"username\"`\n+ Password string `yaml:\"password\"`\n+ DomainName string `yaml:\"domainName\"`\n+ ProjectID string `yaml:\"projectID\"`\n+ Region string `yaml:\"Region\"`\n+ LbSubnetID string `yaml:\"lbSubnetID\"`\n+ RouterID string `yaml:\"routerID\"`\n+ }\n+ Certs map[string]string `yaml:\"certs,omitempty\"`\n+ ClusterCIDR string `yaml:\"clusterCIDR,omitempty\"`\n+ ServiceCIDR string `yaml:\"serviceCIDR,omitempty\"`\n+ AdvertiseAddress string `yaml:\"advertiseAddress,omitempty\"`\n+ }\n+\n+ values := Values{}\n+ values.Kubernikus.BoostrapToken = kluster.Secret.BootstrapToken\n+ values.Openstack.AuthURL = kluster.Spec.Openstack.AuthURL\n+ values.Openstack.Username = kluster.Spec.Openstack.Username\n+ values.Openstack.Password = kluster.Secret.Openstack.Password\n+ values.Openstack.DomainName = kluster.Spec.Openstack.Domain\n+ values.Openstack.ProjectID = kluster.Spec.Openstack.ProjectID\n+ values.Openstack.Region = kluster.Spec.Openstack.Region\n+ values.Openstack.LbSubnetID = kluster.Spec.Openstack.LBSubnetID\n+ values.Openstack.RouterID = kluster.Spec.Openstack.RouterID\n+ values.Certs = kluster.Secret.Certificates\n+ values.ClusterCIDR = kluster.Spec.ClusterCIDR\n+ values.ServiceCIDR = kluster.Spec.ServiceCIDR\n+ values.AdvertiseAddress = kluster.Spec.AdvertiseAddress\n+\n+ result, err := yaml.Marshal(values)\n+ if err != nil {\n+ return nil, err\n+ }\n+\n+ return result, nil\n+}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | externalizes kluster to helm value conversion |
596,240 | 17.10.2017 10:03:41 | -7,200 | c4b87309853ae52e19cdcab98889da5dd8b4c162 | externalizes certificate generation. removes certificates from KlusterSecrets | [
{
"change_type": "MODIFY",
"old_path": "pkg/api/handlers/get_cluster_credentials.go",
"new_path": "pkg/api/handlers/get_cluster_credentials.go",
"diff": "@@ -11,7 +11,7 @@ import (\n\"github.com/sapcc/kubernikus/pkg/api/models\"\n\"github.com/sapcc/kubernikus/pkg/api/rest/operations\"\n\"github.com/sapcc/kubernikus/pkg/client/kubernetes\"\n- \"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\napierrors \"k8s.io/apimachinery/pkg/api/errors\"\n\"k8s.io/apimachinery/pkg/apis/meta/v1\"\ncertutil \"k8s.io/client-go/util/cert\"\n@@ -56,7 +56,7 @@ func (d *getClusterCredentials) Handle(params operations.GetClusterCredentialsPa\nreturn NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 500, \"Server CA certificate not found\")\n}\n- bundle, err := ground.NewBundle(clientCAKey, clientCACert)\n+ bundle, err := util.NewBundle(clientCAKey, clientCACert)\nif err != nil {\nreturn NewErrorResponse(&operations.GetClusterCredentialsDefault{}, 500, \"Failed to parse CA certificate: %s\", err)\n}\n@@ -66,7 +66,7 @@ func (d *getClusterCredentials) Handle(params operations.GetClusterCredentialsPa\norganizations = append(organizations, \"os:\"+role)\n}\n- cert := bundle.Sign(ground.Config{\n+ cert := bundle.Sign(util.Config{\nSign: principal.Name,\nOrganization: organizations,\nUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/v1/kluster.go",
"new_path": "pkg/apis/kubernikus/v1/kluster.go",
"diff": "@@ -69,7 +69,6 @@ type OpenstackSecret struct {\ntype KlusterSecret struct {\nBootstrapToken string `json:\"bootstrapToken\"`\n- Certificates map[string]string `json:\"certificates\"`\nOpenstack OpenstackSecret `json:\"openstack,omitempty\"`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/files.go",
"new_path": "pkg/cmd/kubernikus/certificates/files.go",
"diff": "@@ -5,9 +5,9 @@ import (\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus\"\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n- \"github.com/sapcc/kubernikus/pkg/controller/ground\"\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n)\n@@ -60,9 +60,9 @@ func (o *FilesOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- ground.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n- if err := NewFilePersister(\".\").WriteConfig(kluster); err != nil {\n+ if err := NewFilePersister(\".\").WriteConfig(certificates); err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/io.go",
"new_path": "pkg/cmd/kubernikus/certificates/io.go",
"diff": "@@ -6,12 +6,10 @@ import (\n\"os\"\n\"path\"\n\"path/filepath\"\n-\n- \"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n)\ntype ConfigPersister interface {\n- WriteConfig(*v1.Kluster) error\n+ WriteConfig(map[string]string) error\n}\ntype FilePersister struct {\n@@ -24,8 +22,8 @@ func NewFilePersister(basedir string) *FilePersister {\nreturn p\n}\n-func (fp FilePersister) WriteConfig(kluster *v1.Kluster) error {\n- for filename, contents := range kluster.Secret.Certificates {\n+func (fp FilePersister) WriteConfig(certificates map[string]string) error {\n+ for filename, contents := range certificates {\nif err := write(path.Join(fp.BaseDir, filename), []byte(contents)); err != nil {\nreturn err\n}\n@@ -50,8 +48,8 @@ func NewPlainPersister() *PlainPersister {\nreturn &PlainPersister{}\n}\n-func (fp PlainPersister) WriteConfig(kluster *v1.Kluster) error {\n- for filename, contents := range kluster.Secret.Certificates {\n+func (fp PlainPersister) WriteConfig(certificates map[string]string) error {\n+ for filename, contents := range certificates {\nfmt.Println(filename)\nfmt.Println(contents)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/plain.go",
"new_path": "pkg/cmd/kubernikus/certificates/plain.go",
"diff": "@@ -5,9 +5,9 @@ import (\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus\"\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n- \"github.com/sapcc/kubernikus/pkg/controller/ground\"\n\"github.com/spf13/cobra\"\n)\n@@ -54,9 +54,9 @@ func (o *PlainOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- ground.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n- if err := NewPlainPersister().WriteConfig(kluster); err != nil {\n+ if err := NewPlainPersister().WriteConfig(certificates); err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/sign.go",
"new_path": "pkg/cmd/kubernikus/certificates/sign.go",
"diff": "@@ -9,7 +9,7 @@ import (\n\"github.com/ghodss/yaml\"\n\"github.com/sapcc/kubernikus/pkg/client/kubernetes\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n- \"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n\"k8s.io/apimachinery/pkg/apis/meta/v1\"\n@@ -103,11 +103,11 @@ func (o *SignOptions) Run(c *cobra.Command) error {\nreturn fmt.Errorf(\"Server CA certificate not found\")\n}\n- bundle, err := ground.NewBundle(clientCAKey, clientCACert)\n+ bundle, err := util.NewBundle(clientCAKey, clientCACert)\nif err != nil {\nreturn err\n}\n- cert := bundle.Sign(ground.Config{\n+ cert := bundle.Sign(util.Config{\nSign: o.CN,\nOrganization: []string{o.Organization},\nUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -9,7 +9,7 @@ import (\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus\"\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n- \"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\n\"github.com/sapcc/kubernikus/pkg/util/helm\"\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n@@ -100,9 +100,9 @@ func (o *HelmOptions) Run(c *cobra.Command) error {\nkluster.Spec.Openstack.AuthURL = o.AuthURL\n}\n- ground.CreateCertificates(kluster, nameA[1])\n+ certificates := util.CreateCertificates(kluster, nameA[1])\n- result, err := helm.KlusterToHelmValues(kluster)\n+ result, err := helm.KlusterToHelmValues(kluster, certificates)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -22,6 +22,7 @@ import (\n\"github.com/sapcc/kubernikus/pkg/client/kubernetes\"\n\"github.com/sapcc/kubernikus/pkg/controller/config\"\n\"github.com/sapcc/kubernikus/pkg/controller/ground\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\nhelm_util \"github.com/sapcc/kubernikus/pkg/util/helm\"\n)\n@@ -266,8 +267,6 @@ func (op *GroundControl) updateStatus(tpr *v1.Kluster, state v1.KlusterState, me\n}\nfunc (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n- ground.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n-\nglog.Infof(\"Creating service user %s\", tpr.Spec.Openstack.Username)\nif err := op.Clients.Openstack.CreateKlusterServiceUser(\ntpr.Spec.Openstack.Username,\n@@ -279,7 +278,8 @@ func (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n}\n//Generate helm values from cluster struct\n- rawValues, err := helm_util.KlusterToHelmValues(tpr)\n+ certificates := util.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n+ rawValues, err := helm_util.KlusterToHelmValues(tpr, certificates)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "RENAME",
"old_path": "pkg/controller/ground/certificates.go",
"new_path": "pkg/util/certificates.go",
"diff": "-package ground\n+package util\nimport (\n\"crypto/rand\"\n@@ -164,7 +164,7 @@ func (c Certificates) all() []Bundle {\n}\n}\n-func CreateCertificates(kluster *v1.Kluster, domain string) {\n+func CreateCertificates(kluster *v1.Kluster, domain string) map[string]string {\ncerts := &Certificates{}\ncreateCA(kluster.Name, \"Etcd Clients\", &certs.Etcd.Clients.CA)\ncreateCA(kluster.Name, \"Etcd Peers\", &certs.Etcd.Peers.CA)\n@@ -188,7 +188,7 @@ func CreateCertificates(kluster *v1.Kluster, domain string) {\ncerts.TLS.Wormhole = certs.signTLS(\"wormhole\",\n[]string{fmt.Sprintf(\"%v-wormhole.%v\", kluster.Name, domain)}, []net.IP{})\n- kluster.Secret.Certificates = certs.toMap()\n+ return certs.toMap()\n}\nfunc (c Certificates) signEtcdClient(name string) Bundle {\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -5,7 +5,7 @@ import (\nyaml \"gopkg.in/yaml.v2\"\n)\n-func KlusterToHelmValues(kluster *v1.Kluster) ([]byte, error) {\n+func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string) ([]byte, error) {\ntype Values struct {\nKubernikus struct {\nBoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n@@ -36,7 +36,7 @@ func KlusterToHelmValues(kluster *v1.Kluster) ([]byte, error) {\nvalues.Openstack.Region = kluster.Spec.Openstack.Region\nvalues.Openstack.LbSubnetID = kluster.Spec.Openstack.LBSubnetID\nvalues.Openstack.RouterID = kluster.Spec.Openstack.RouterID\n- values.Certs = kluster.Secret.Certificates\n+ values.Certs = certificates\nvalues.ClusterCIDR = kluster.Spec.ClusterCIDR\nvalues.ServiceCIDR = kluster.Spec.ServiceCIDR\nvalues.AdvertiseAddress = kluster.Spec.AdvertiseAddress\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | externalizes certificate generation. removes certificates from KlusterSecrets |
596,240 | 17.10.2017 10:10:25 | -7,200 | aed36277a9ef01b5868b1d03c1517c74195adb2c | removes kubernikus sub-values for idiomit value structure | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/_token.csv.tpl",
"new_path": "charts/kube-master/templates/_token.csv.tpl",
"diff": "{{/* vim: set filetype=gotexttmpl: */ -}}\n-{{ required \"missing kubernikus.boostrapToken\" .Values.kubernikus.bootstrapToken }},kubelet-bootstrap,10001,\"system:bootstrappers\"\n+{{ required \"missing boostrapToken\" .Values.bootstrapToken }},kubelet-bootstrap,10001,\"system:bootstrappers\"\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/api.yaml",
"new_path": "charts/kube-master/templates/api.yaml",
"diff": "@@ -144,7 +144,7 @@ spec:\nresources:\n{{ toYaml .Values.api.resources | indent 12 }}\n- name: wormhole\n- image: sapcc/kubernikus:{{ required \"kubernikus.version missing\" .Values.kubernikus.version }}\n+ image: sapcc/kubernikus:{{ required \".version missing\" .Values.version }}\nargs:\n- wormhole\n- server\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -17,10 +17,6 @@ openstack: {}\n#lbSubnetID:\n#routerID:\n-kubernikus: {}\n- #bootstrapToken\n- #version:\n-\n# specify a different certsSecretName if you want to use\n# an exiting secret\n# certsSecretName:\n@@ -31,6 +27,8 @@ certs: {}\nclusterCIDR: 198.19.0.0/16\nserviceCIDR: 198.18.128.0/17\nadvertiseAddress: 198.18.127.1\n+#bootstrapToken\n+#version:\napi:\nreplicaCount: 1\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -7,9 +7,6 @@ import (\nfunc KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string) ([]byte, error) {\ntype Values struct {\n- Kubernikus struct {\n- BoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n- }\nOpenstack struct {\nAuthURL string `yaml:\"authURL\"`\nUsername string `yaml:\"username\"`\n@@ -24,10 +21,11 @@ func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string) ([\nClusterCIDR string `yaml:\"clusterCIDR,omitempty\"`\nServiceCIDR string `yaml:\"serviceCIDR,omitempty\"`\nAdvertiseAddress string `yaml:\"advertiseAddress,omitempty\"`\n+ BoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n}\nvalues := Values{}\n- values.Kubernikus.BoostrapToken = kluster.Secret.BootstrapToken\n+ values.BoostrapToken = kluster.Secret.BootstrapToken\nvalues.Openstack.AuthURL = kluster.Spec.Openstack.AuthURL\nvalues.Openstack.Username = kluster.Spec.Openstack.Username\nvalues.Openstack.Password = kluster.Secret.Openstack.Password\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | removes kubernikus sub-values for idiomit value structure |
596,240 | 17.10.2017 10:19:36 | -7,200 | 3824721d2873c4b9380d8ad42738c439a1ffaff2 | removes bootstrapToken from kluster. Partly fixes | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/secrets.yaml",
"new_path": "charts/kube-master/templates/secrets.yaml",
"diff": "@@ -17,6 +17,7 @@ data:\nopenstack-lb-subnet-id: {{ .Values.openstack.lbSubnetID | b64enc }}\nopenstack-router-id: {{ .Values.openstack.routerID | b64enc }}\n+ bootstrapToken: {{ required \"missing boostrapToken\" .Values.bootstrapToken | b64enc }}\ntoken.csv: {{ include (print $.Template.BasePath \"/_token.csv.tpl\") . | b64enc }}\n{{- if empty .Values.certsSecretName }}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/v1/kluster.go",
"new_path": "pkg/apis/kubernikus/v1/kluster.go",
"diff": "@@ -68,7 +68,6 @@ type OpenstackSecret struct {\n}\ntype KlusterSecret struct {\n- BootstrapToken string `json:\"bootstrapToken\"`\nOpenstack OpenstackSecret `json:\"openstack,omitempty\"`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -101,8 +101,9 @@ func (o *HelmOptions) Run(c *cobra.Command) error {\n}\ncertificates := util.CreateCertificates(kluster, nameA[1])\n+ token := util.GenerateBootstrapToken()\n- result, err := helm.KlusterToHelmValues(kluster, certificates)\n+ result, err := helm.KlusterToHelmValues(kluster, certificates, token)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -279,7 +279,8 @@ func (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n//Generate helm values from cluster struct\ncertificates := util.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n- rawValues, err := helm_util.KlusterToHelmValues(tpr, certificates)\n+ bootstrapToken := util.GenerateBootstrapToken()\n+ rawValues, err := helm_util.KlusterToHelmValues(tpr, certificates, bootstrapToken)\nif err != nil {\nreturn err\n}\n@@ -326,7 +327,6 @@ func (op *GroundControl) requiresOpenstackInfo(kluster *v1.Kluster) bool {\nfunc (op *GroundControl) requiresKubernikusInfo(kluster *v1.Kluster) bool {\nreturn kluster.Status.Apiserver == \"\" ||\nkluster.Status.Wormhole == \"\" ||\n- kluster.Secret.BootstrapToken == \"\" ||\nkluster.Spec.Domain == \"\"\n}\n@@ -348,15 +348,6 @@ func (op *GroundControl) discoverKubernikusInfo(kluster *v1.Kluster) error {\nglog.V(5).Infof(\"[%v] Setting WormholeURL to %v\", kluster.Name, copy.Status.Wormhole)\n}\n- if copy.Secret.BootstrapToken == \"\" {\n- token, err := goutils.Random(16, 32, 127, true, true)\n- if err != nil {\n- return fmt.Errorf(\"Failed to generate bootstrap token: %s\", err)\n- }\n- copy.Secret.BootstrapToken = strings.ToLower(token)\n- glog.V(5).Infof(\"[%v] Setting bootstrap token to %v\", kluster.Name, copy.Secret.BootstrapToken)\n- }\n-\n_, err = op.Clients.Kubernikus.Kubernikus().Klusters(kluster.Namespace).Update(copy)\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/templates/ignition.go",
"new_path": "pkg/templates/ignition.go",
"diff": "@@ -56,6 +56,7 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nKubeletClientsCA: string(secret.Data[\"kubelet-clients-ca.pem\"]),\nApiserverClientsSystemKubeProxy: string(secret.Data[\"apiserver-clients-system-kube-proxy.pem\"]),\nApiserverClientsSystemKubeProxyKey: string(secret.Data[\"apiserver-clients-system-kube-proxy-key.pem\"]),\n+ BootstrapToken: string(secret.Data[\"bootstrapToken\"]),\nClusterCIDR: kluster.Spec.ClusterCIDR,\nClusterDNS: kluster.Spec.ClusterDNS,\nClusterDomain: kluster.Spec.ClusterDNSDomain,\n@@ -67,7 +68,6 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nOpenstackRegion: kluster.Spec.Openstack.Region,\nOpenstackLBSubnetID: kluster.Spec.Openstack.LBSubnetID,\nOpenstackRouterID: kluster.Spec.Openstack.RouterID,\n- BootstrapToken: kluster.Secret.BootstrapToken,\nKubernikusImage: \"sapcc/kubernikus\",\nKubernikusImageTag: version.VERSION,\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/util/bootstrap.go",
"diff": "+package util\n+\n+import (\n+ \"github.com/aokoli/goutils\"\n+)\n+\n+func GenerateBootstrapToken() string {\n+ token, _ := goutils.Random(16, 32, 127, true, true)\n+ return token\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -5,7 +5,7 @@ import (\nyaml \"gopkg.in/yaml.v2\"\n)\n-func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string) ([]byte, error) {\n+func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string, bootstrapToken string) ([]byte, error) {\ntype Values struct {\nOpenstack struct {\nAuthURL string `yaml:\"authURL\"`\n@@ -25,16 +25,17 @@ func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string) ([\n}\nvalues := Values{}\n- values.BoostrapToken = kluster.Secret.BootstrapToken\n+ values.BoostrapToken = bootstrapToken\n+ values.Certs = certificates\n+ values.Openstack.Password = kluster.Secret.Openstack.Password\n+\nvalues.Openstack.AuthURL = kluster.Spec.Openstack.AuthURL\nvalues.Openstack.Username = kluster.Spec.Openstack.Username\n- values.Openstack.Password = kluster.Secret.Openstack.Password\nvalues.Openstack.DomainName = kluster.Spec.Openstack.Domain\nvalues.Openstack.ProjectID = kluster.Spec.Openstack.ProjectID\nvalues.Openstack.Region = kluster.Spec.Openstack.Region\nvalues.Openstack.LbSubnetID = kluster.Spec.Openstack.LBSubnetID\nvalues.Openstack.RouterID = kluster.Spec.Openstack.RouterID\n- values.Certs = certificates\nvalues.ClusterCIDR = kluster.Spec.ClusterCIDR\nvalues.ServiceCIDR = kluster.Spec.ServiceCIDR\nvalues.AdvertiseAddress = kluster.Spec.AdvertiseAddress\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | removes bootstrapToken from kluster. Partly fixes #67 |
596,240 | 17.10.2017 11:37:39 | -7,200 | 9aa161c460102cf5ffea56c2ca88c669e867e480 | seperates secrets and specs. removes all secrets from kluster. fixes | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/secrets.yaml",
"new_path": "charts/kube-master/templates/secrets.yaml",
"diff": "@@ -10,12 +10,14 @@ type: Opaque\ndata:\nopenstack.config: {{ include (print $.Template.BasePath \"/_openstack.config.tpl\") . | b64enc}}\n- openstack-auth-url: {{ .Values.openstack.authURL | b64enc }}\n- openstack-username: {{ .Values.openstack.username | b64enc }}\n- openstack-password: {{ .Values.openstack.password | b64enc }}\n- openstack-domain-name: {{ .Values.openstack.domainName | b64enc }}\n- openstack-lb-subnet-id: {{ .Values.openstack.lbSubnetID | b64enc }}\n- openstack-router-id: {{ .Values.openstack.routerID | b64enc }}\n+ openstack-auth-url: {{ required \"missing openstack-auth-url\" .Values.openstack.authURL | b64enc }}\n+ openstack-username: {{ required \"missing openstack-username\" .Values.openstack.username | b64enc }}\n+ openstack-password: {{ required \"missing openstack-password\" .Values.openstack.password | b64enc }}\n+ openstack-domain-name: {{ required \"missing openstack-domain-name\" .Values.openstack.domainName | b64enc }}\n+ openstack-lb-subnet-id: {{ required \"missing openstack-lb-subnet-id\" .Values.openstack.lbSubnetID | b64enc }}\n+ openstack-router-id: {{ required \"missing openstack-router-id\" .Values.openstack.routerID | b64enc }}\n+ openstack-project-id: {{ required \"missing openstack-project-id\" .Values.openstack.projectID | b64enc }}\n+ openstack-region: {{ required \"missing openstack-region\" .Values.openstack.region | b64enc }}\nbootstrapToken: {{ required \"missing boostrapToken\" .Values.bootstrapToken | b64enc }}\ntoken.csv: {{ include (print $.Template.BasePath \"/_token.csv.tpl\") . | b64enc }}\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -16,6 +16,7 @@ openstack: {}\n#region:\n#lbSubnetID:\n#routerID:\n+ #region\n# specify a different certsSecretName if you want to use\n# an exiting secret\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/v1/kluster.go",
"new_path": "pkg/apis/kubernikus/v1/kluster.go",
"diff": "@@ -18,14 +18,10 @@ type NodePool struct {\n}\ntype OpenstackSpec struct {\n- AuthURL string `json:\"authURL\"`\nProjectID string `json:\"projectID\"`\nRouterID string `json:\"routerID\"`\nNetworkID string `json:\"networkID\"`\nLBSubnetID string `json:\"lbSubnetID\"`\n- Domain string `json:\"domain\"`\n- Region string `json:\"region\"`\n- Username string `json:\"username\"`\n}\ntype KlusterSpec struct {\n@@ -63,14 +59,6 @@ type KlusterInfo struct {\nMessage string `json:\"message,omitempty\"`\n}\n-type OpenstackSecret struct {\n- Password string `json:\"password\"`\n-}\n-\n-type KlusterSecret struct {\n- Openstack OpenstackSecret `json:\"openstack,omitempty\"`\n-}\n-\ntype NodePoolInfo struct {\nName string `json:\"name\"`\nSize int `json:size`\n@@ -86,7 +74,6 @@ type Kluster struct {\nmetav1.ObjectMeta `json:\"metadata\"`\nSpec KlusterSpec `json:\"spec\"`\nStatus KlusterStatus `json:\"status,omitempty\"`\n- Secret KlusterSecret `json:\"secret\"`\n}\ntype KlusterList struct {\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -232,7 +232,7 @@ func (c *client) controlPlaneClient() (*gophercloud.ProviderClient, error) {\nDomainName: c.authDomain,\nAllowReauth: true,\nScope: tokens.Scope{\n- ProjectID: \"06a832fedd4b422bbf2d6d52be59a93d\",\n+ ProjectID: \"06a832fedd4b422bbf2d6d52be59a93d\", // TODO: wtf\n},\n}\n@@ -270,7 +270,7 @@ func (c *client) klusterClientFor(kluster *kubernikus_v1.Kluster) (*gophercloud.\nDomainName: string(secret.Data[\"openstack-domain-name\"]),\nAllowReauth: true,\nScope: tokens.Scope{\n- ProjectID: kluster.Spec.Openstack.ProjectID,\n+ ProjectID: string(secret.Data[\"openstack-project-id\"]),\n},\n}\n@@ -534,7 +534,6 @@ func getRouterNetworks(client *gophercloud.ServiceClient, routerID string) ([]st\n}\nfunc (c *client) GetNodes(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.NodePool) ([]Node, error) {\n- project_id := kluster.Spec.Openstack.RouterID\npool_id := pool.Name\nprovider, err := c.klusterClientFor(kluster)\n@@ -547,7 +546,6 @@ func (c *client) GetNodes(kluster *kubernikus_v1.Kluster, pool *kubernikus_v1.No\nif err != nil {\nreturn nodes, err\n}\n- glog.V(5).Infof(\"Listing nodes for %v/%v\", project_id, pool_id)\nprefix := fmt.Sprintf(\"%v-%v\", kluster.Spec.Name, pool_id)\nopts := servers.ListOpts{Name: prefix}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -91,19 +91,27 @@ func (o *HelmOptions) Complete(args []string) error {\nfunc (o *HelmOptions) Run(c *cobra.Command) error {\nnameA := strings.SplitN(o.Name, \".\", 2)\n- kluster, err := kubernikus.NewKlusterFactory().KlusterFor(v1.KlusterSpec{Name: nameA[0]})\n+ kluster, err := kubernikus.NewKlusterFactory().KlusterFor(v1.KlusterSpec{\n+ Name: nameA[0],\n+ Openstack: v1.OpenstackSpec{\n+ ProjectID: o.ProjectID,\n+ },\n+ })\nif err != nil {\nreturn err\n}\n- if o.AuthURL != \"\" {\n- kluster.Spec.Openstack.AuthURL = o.AuthURL\n+ options := &helm.OpenstackOptions{\n+ AuthURL: o.AuthURL,\n+ Username: o.AuthUsername,\n+ Password: o.AuthPassword,\n+ DomainName: o.AuthDomain,\n}\ncertificates := util.CreateCertificates(kluster, nameA[1])\ntoken := util.GenerateBootstrapToken()\n- result, err := helm.KlusterToHelmValues(kluster, certificates, token)\n+ result, err := helm.KlusterToHelmValues(kluster, options, certificates, token)\nif err != nil {\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -267,20 +267,38 @@ func (op *GroundControl) updateStatus(tpr *v1.Kluster, state v1.KlusterState, me\n}\nfunc (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n- glog.Infof(\"Creating service user %s\", tpr.Spec.Openstack.Username)\n+ certificates := util.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n+ bootstrapToken := util.GenerateBootstrapToken()\n+ username := fmt.Sprintf(\"kubernikus-%s\", tpr.Name)\n+ password, err := goutils.Random(20, 32, 127, true, true)\n+ if err != nil {\n+ return fmt.Errorf(\"Failed to generate password: %s\", err)\n+ }\n+ domain := \"kubernikus\"\n+ region, err := op.Clients.Openstack.GetRegion()\n+ if err != nil {\n+ return err\n+ }\n+\n+ glog.Infof(\"Creating service user %s\", username)\nif err := op.Clients.Openstack.CreateKlusterServiceUser(\n- tpr.Spec.Openstack.Username,\n- tpr.Secret.Openstack.Password,\n- tpr.Spec.Openstack.Domain,\n+ username,\n+ password,\n+ domain,\ntpr.Spec.Openstack.ProjectID,\n); err != nil {\nreturn err\n}\n- //Generate helm values from cluster struct\n- certificates := util.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n- bootstrapToken := util.GenerateBootstrapToken()\n- rawValues, err := helm_util.KlusterToHelmValues(tpr, certificates, bootstrapToken)\n+ options := &helm_util.OpenstackOptions{\n+ AuthURL: op.Config.Openstack.AuthURL,\n+ Username: username,\n+ Password: password,\n+ DomainName: domain,\n+ Region: region,\n+ }\n+\n+ rawValues, err := helm_util.KlusterToHelmValues(tpr, options, certificates, bootstrapToken)\nif err != nil {\nreturn err\n}\n@@ -292,14 +310,22 @@ func (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n}\nfunc (op *GroundControl) terminateKluster(tpr *v1.Kluster) error {\n+ secret, err := op.Clients.Kubernetes.CoreV1().Secrets(tpr.Namespace).Get(tpr.GetName(), metav1.GetOptions{})\n+ if err != nil {\n+ return err\n+ }\n+\n+ username := string(secret.Data[\"openstack-username\"])\n+ domain := string(secret.Data[\"openstack-domain-name\"])\n+\nglog.Infof(\"Deleting helm release %s\", tpr.GetName())\n- _, err := op.Clients.Helm.DeleteRelease(tpr.GetName(), helm.DeletePurge(true))\n+ _, err = op.Clients.Helm.DeleteRelease(tpr.GetName(), helm.DeletePurge(true))\nif err != nil && !strings.Contains(grpc.ErrorDesc(err), fmt.Sprintf(`release: \"%s\" not found`, tpr.GetName())) {\nreturn err\n}\n- glog.Infof(\"Deleting openstack user %s@%s\", tpr.Spec.Openstack.Username, tpr.Spec.Openstack.Domain)\n- if err := op.Clients.Openstack.DeleteUser(tpr.Spec.Openstack.Username, tpr.Spec.Openstack.Domain); err != nil {\n+ glog.Infof(\"Deleting openstack user %s@%s\", username, domain)\n+ if err := op.Clients.Openstack.DeleteUser(username, domain); err != nil {\nreturn err\n}\n@@ -315,19 +341,11 @@ func (op *GroundControl) requiresOpenstackInfo(kluster *v1.Kluster) bool {\nreturn kluster.Spec.Openstack.ProjectID == \"\" ||\nkluster.Spec.Openstack.RouterID == \"\" ||\nkluster.Spec.Openstack.NetworkID == \"\" ||\n- kluster.Spec.Openstack.LBSubnetID == \"\" ||\n- kluster.Spec.Openstack.Domain == \"\" ||\n- kluster.Spec.Openstack.Region == \"\" ||\n- kluster.Spec.Openstack.Username == \"\" ||\n- kluster.Secret.Openstack.Password == \"\" ||\n- kluster.Spec.Openstack.AuthURL == \"\"\n-\n+ kluster.Spec.Openstack.LBSubnetID == \"\"\n}\nfunc (op *GroundControl) requiresKubernikusInfo(kluster *v1.Kluster) bool {\n- return kluster.Status.Apiserver == \"\" ||\n- kluster.Status.Wormhole == \"\" ||\n- kluster.Spec.Domain == \"\"\n+ return kluster.Status.Apiserver == \"\" || kluster.Status.Wormhole == \"\"\n}\nfunc (op *GroundControl) discoverKubernikusInfo(kluster *v1.Kluster) error {\n@@ -401,36 +419,6 @@ func (op *GroundControl) discoverOpenstackInfo(kluster *v1.Kluster) error {\n}\n}\n- if copy.Spec.Openstack.Domain == \"\" {\n- glog.V(5).Infof(\"[%v] Setting domain to %v\", kluster.Name, \"kubernikus\")\n- copy.Spec.Openstack.Domain = \"kubernikus\"\n- }\n-\n- if copy.Spec.Openstack.Region == \"\" {\n- copy.Spec.Openstack.Region, err = op.Clients.Openstack.GetRegion()\n- if err != nil {\n- return err\n- }\n- glog.V(5).Infof(\"[%v] Setting region to %v\", kluster.Name, copy.Spec.Openstack.Region)\n- }\n-\n- if copy.Spec.Openstack.AuthURL == \"\" {\n- copy.Spec.Openstack.AuthURL = op.Config.Openstack.AuthURL\n- glog.V(5).Infof(\"[%v] Setting authURL to %v\", kluster.Name, op.Config.Openstack.AuthURL)\n- }\n-\n- if copy.Spec.Openstack.Username == \"\" {\n- copy.Spec.Openstack.Username = fmt.Sprintf(\"kubernikus-%s\", kluster.Name)\n- glog.V(5).Infof(\"[%v] Setting Username to %v\", kluster.Name, copy.Spec.Openstack.Username)\n- }\n-\n- if copy.Secret.Openstack.Password == \"\" {\n- glog.V(5).Infof(\"[%v] Setting Password to %v\", kluster.Name, \"[redacted]\")\n- if copy.Secret.Openstack.Password, err = goutils.Random(20, 32, 127, true, true); err != nil {\n- return fmt.Errorf(\"Failed to generate password: %s\", err)\n- }\n- }\n-\n_, err = op.Clients.Kubernikus.Kubernikus().Klusters(kluster.Namespace).Update(copy)\nreturn err\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/templates/ignition.go",
"new_path": "pkg/templates/ignition.go",
"diff": "@@ -61,11 +61,11 @@ func (i *ignition) GenerateNode(kluster *v1.Kluster, client kubernetes.Interface\nClusterDNS: kluster.Spec.ClusterDNS,\nClusterDomain: kluster.Spec.ClusterDNSDomain,\nApiserverURL: kluster.Status.Apiserver,\n- OpenstackAuthURL: kluster.Spec.Openstack.AuthURL,\n- OpenstackUsername: kluster.Spec.Openstack.Username,\n- OpenstackPassword: kluster.Secret.Openstack.Password,\n- OpenstackDomain: kluster.Spec.Openstack.Domain,\n- OpenstackRegion: kluster.Spec.Openstack.Region,\n+ OpenstackAuthURL: string(secret.Data[\"openstack-auth-url\"]),\n+ OpenstackUsername: string(secret.Data[\"openstack-username\"]),\n+ OpenstackPassword: string(secret.Data[\"openstack-password\"]),\n+ OpenstackDomain: string(secret.Data[\"openstack-domain-name\"]),\n+ OpenstackRegion: string(secret.Data[\"openstack-region\"]),\nOpenstackLBSubnetID: kluster.Spec.Openstack.LBSubnetID,\nOpenstackRouterID: kluster.Spec.Openstack.RouterID,\nKubernikusImage: \"sapcc/kubernikus\",\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -5,9 +5,15 @@ import (\nyaml \"gopkg.in/yaml.v2\"\n)\n-func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string, bootstrapToken string) ([]byte, error) {\n- type Values struct {\n- Openstack struct {\n+type OpenstackOptions struct {\n+ AuthURL string\n+ Username string\n+ Password string\n+ DomainName string\n+ Region string\n+}\n+\n+type openstackValues struct {\nAuthURL string `yaml:\"authURL\"`\nUsername string `yaml:\"username\"`\nPassword string `yaml:\"password\"`\n@@ -17,6 +23,9 @@ func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string, bo\nLbSubnetID string `yaml:\"lbSubnetID\"`\nRouterID string `yaml:\"routerID\"`\n}\n+\n+type kubernikusHelmValues struct {\n+ Openstack openstackValues `yaml:\"openstack,omitempty\"`\nCerts map[string]string `yaml:\"certs,omitempty\"`\nClusterCIDR string `yaml:\"clusterCIDR,omitempty\"`\nServiceCIDR string `yaml:\"serviceCIDR,omitempty\"`\n@@ -24,21 +33,24 @@ func KlusterToHelmValues(kluster *v1.Kluster, certificates map[string]string, bo\nBoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n}\n- values := Values{}\n- values.BoostrapToken = bootstrapToken\n- values.Certs = certificates\n- values.Openstack.Password = kluster.Secret.Openstack.Password\n-\n- values.Openstack.AuthURL = kluster.Spec.Openstack.AuthURL\n- values.Openstack.Username = kluster.Spec.Openstack.Username\n- values.Openstack.DomainName = kluster.Spec.Openstack.Domain\n- values.Openstack.ProjectID = kluster.Spec.Openstack.ProjectID\n- values.Openstack.Region = kluster.Spec.Openstack.Region\n- values.Openstack.LbSubnetID = kluster.Spec.Openstack.LBSubnetID\n- values.Openstack.RouterID = kluster.Spec.Openstack.RouterID\n- values.ClusterCIDR = kluster.Spec.ClusterCIDR\n- values.ServiceCIDR = kluster.Spec.ServiceCIDR\n- values.AdvertiseAddress = kluster.Spec.AdvertiseAddress\n+func KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certificates map[string]string, bootstrapToken string) ([]byte, error) {\n+ values := kubernikusHelmValues{\n+ BoostrapToken: bootstrapToken,\n+ Certs: certificates,\n+ ClusterCIDR: kluster.Spec.ClusterCIDR,\n+ ServiceCIDR: kluster.Spec.ServiceCIDR,\n+ AdvertiseAddress: kluster.Spec.AdvertiseAddress,\n+ Openstack: openstackValues{\n+ AuthURL: openstack.AuthURL,\n+ Username: openstack.Username,\n+ Password: openstack.Password,\n+ DomainName: openstack.DomainName,\n+ Region: openstack.Region,\n+ ProjectID: kluster.Spec.Openstack.ProjectID,\n+ LbSubnetID: kluster.Spec.Openstack.LBSubnetID,\n+ RouterID: kluster.Spec.Openstack.RouterID,\n+ },\n+ }\nresult, err := yaml.Marshal(values)\nif err != nil {\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | seperates secrets and specs. removes all secrets from kluster. fixes #67 |
596,240 | 17.10.2017 14:19:45 | -7,200 | 4f6973ca0ed0eaafa522ae16123cfa71b66e03cd | unifies kluster names | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -284,7 +284,7 @@ jobs:\nfile: pipeline.git/ci/task_helm-admin_kubernikus.yaml\nparams:\nREGION: admin\n- KUBERNIKUS_NAME: kubernikus-staging\n+ KUBERNIKUS_NAME: k-staging\nGITHUB_TOKEN: ((github-access-token))\n- name: rollout_admin\n@@ -314,7 +314,7 @@ jobs:\nfile: pipeline.git/ci/task_helm-admin_kubernikus.yaml\nparams:\nREGION: admin\n- KUBERNIKUS_NAME: kubernikus-eu-nl-1\n+ KUBERNIKUS_NAME: k-eu-nl-1\nGITHUB_TOKEN: ((github-access-token))\non_failure:\n<<: *post_failure_to_slack\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | unifies kluster names |
596,240 | 17.10.2017 14:24:05 | -7,200 | 8e78ef8f43fa0bd54a9ab20a4cfee4f761f28873 | turns region lowercase | [
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -19,7 +19,7 @@ type openstackValues struct {\nPassword string `yaml:\"password\"`\nDomainName string `yaml:\"domainName\"`\nProjectID string `yaml:\"projectID\"`\n- Region string `yaml:\"Region\"`\n+ Region string `yaml:\"region\"`\nLbSubnetID string `yaml:\"lbSubnetID\"`\nRouterID string `yaml:\"routerID\"`\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | turns region lowercase |
596,240 | 17.10.2017 15:36:36 | -7,200 | 5b4648ec0b3d1ceb42b2508ea57c0775d12dfd51 | burns some auth-info into CA certs | [
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/factory.go",
"new_path": "pkg/apis/kubernikus/factory.go",
"diff": "@@ -60,6 +60,10 @@ func (klusterFactory) KlusterFor(spec v1.KlusterSpec) (*v1.Kluster, error) {\nk.Spec.ClusterDNSDomain = DEFAULT_CLUSTER_DNS_DOMAIN\n}\n+ if k.ObjectMeta.Name == \"\" {\n+ k.ObjectMeta.Name = spec.Name\n+ }\n+\nfor _, nodePool := range k.Spec.NodePools {\nk.Status.NodePools = append(k.Status.NodePools, v1.NodePoolInfo{\nName: nodePool.Name,\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/files.go",
"new_path": "pkg/cmd/kubernikus/certificates/files.go",
"diff": "@@ -60,7 +60,7 @@ func (o *FilesOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- certificates := util.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"https://identity.openstack.com\", \"kubernikus.cloud.sap\")\nif err := NewFilePersister(\".\").WriteConfig(certificates); err != nil {\nreturn err\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/plain.go",
"new_path": "pkg/cmd/kubernikus/certificates/plain.go",
"diff": "@@ -54,7 +54,7 @@ func (o *PlainOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- certificates := util.CreateCertificates(kluster, \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"https://auth.openstack.com\", \"kubernikus.cloud.sap\")\nif err := NewPlainPersister().WriteConfig(certificates); err != nil {\nreturn err\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -108,7 +108,7 @@ func (o *HelmOptions) Run(c *cobra.Command) error {\nDomainName: o.AuthDomain,\n}\n- certificates := util.CreateCertificates(kluster, nameA[1])\n+ certificates := util.CreateCertificates(kluster, o.AuthURL, nameA[1])\ntoken := util.GenerateBootstrapToken()\nresult, err := helm.KlusterToHelmValues(kluster, options, certificates, token, \"\")\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -267,12 +267,11 @@ func (op *GroundControl) updateStatus(tpr *v1.Kluster, state v1.KlusterState, me\n}\nfunc (op *GroundControl) createKluster(tpr *v1.Kluster) error {\n-\naccessMode, err := kubernetes.PVAccessMode(op.Clients.Kubernetes)\nif err != nil {\nreturn fmt.Errorf(\"Couldn't determine access mode for pvc: %s\", err)\n}\n- certificates := util.CreateCertificates(tpr, op.Config.Kubernikus.Domain)\n+ certificates := util.CreateCertificates(tpr, op.Config.Openstack.AuthURL, op.Config.Kubernikus.Domain)\nbootstrapToken := util.GenerateBootstrapToken()\nusername := fmt.Sprintf(\"kubernikus-%s\", tpr.Name)\npassword, err := goutils.Random(20, 32, 127, true, true)\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/certificates.go",
"new_path": "pkg/util/certificates.go",
"diff": "@@ -164,7 +164,7 @@ func (c Certificates) all() []Bundle {\n}\n}\n-func CreateCertificates(kluster *v1.Kluster, domain string) map[string]string {\n+func CreateCertificates(kluster *v1.Kluster, authURL, domain string) map[string]string {\ncerts := &Certificates{}\ncreateCA(kluster.Name, \"Etcd Clients\", &certs.Etcd.Clients.CA)\ncreateCA(kluster.Name, \"Etcd Peers\", &certs.Etcd.Peers.CA)\n@@ -172,6 +172,7 @@ func CreateCertificates(kluster *v1.Kluster, domain string) map[string]string {\ncreateCA(kluster.Name, \"ApiServer Nodes\", &certs.ApiServer.Nodes.CA)\ncreateCA(kluster.Name, \"Kubelet Clients\", &certs.Kubelet.Clients.CA)\ncreateCA(kluster.Name, \"TLS\", &certs.TLS.CA)\n+ createEnrichedCA(kluster, authURL, \"TLS\", &certs.TLS.CA)\ncerts.Etcd.Clients.ApiServer = certs.signEtcdClient(\"apiserver\")\ncerts.Etcd.Peers.Universal = certs.signEtcdPeer(\"universal\")\n@@ -266,6 +267,29 @@ func createCA(satellite, name string, bundle *Bundle) {\nbundle.Certificate, _ = x509.ParseCertificate(certDERBytes)\n}\n+func createEnrichedCA(kluster *v1.Kluster, authURL, common_name string, bundle *Bundle) {\n+ bundle.PrivateKey, _ = certutil.NewPrivateKey()\n+\n+ now := time.Now()\n+ tmpl := x509.Certificate{\n+ SerialNumber: new(big.Int).SetInt64(0),\n+ Subject: pkix.Name{\n+ CommonName: common_name,\n+ OrganizationalUnit: []string{\"SAP Converged Cloud\", \"Kubernikus\", kluster.Name},\n+ Province: []string{authURL, kluster.Spec.Openstack.ProjectID},\n+ Locality: []string{kluster.Status.Apiserver},\n+ },\n+ NotBefore: now.UTC(),\n+ NotAfter: now.Add(caValidity).UTC(),\n+ KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,\n+ BasicConstraintsValid: true,\n+ IsCA: true,\n+ }\n+\n+ certDERBytes, _ := x509.CreateCertificate(rand.Reader, &tmpl, &tmpl, bundle.PrivateKey.Public(), bundle.PrivateKey)\n+ bundle.Certificate, _ = x509.ParseCertificate(certDERBytes)\n+}\n+\nfunc (ca Bundle) Sign(config Config) Bundle {\nif !ca.Certificate.IsCA {\npanic(\"You can't use this certificate for signing. It's not a CA...\")\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | burns some auth-info into CA certs |
596,240 | 17.10.2017 15:59:03 | -7,200 | 7d80c0376db9ec92108ccbf1432e102b2c0a45d1 | passes version through to helm values | [
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/factory.go",
"new_path": "pkg/apis/kubernikus/factory.go",
"diff": "@@ -4,6 +4,7 @@ import (\n\"fmt\"\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\n+ \"github.com/sapcc/kubernikus/pkg/version\"\n)\nconst (\n@@ -64,6 +65,10 @@ func (klusterFactory) KlusterFor(spec v1.KlusterSpec) (*v1.Kluster, error) {\nk.ObjectMeta.Name = spec.Name\n}\n+ if k.Spec.Version == \"\" {\n+ k.Spec.Version = version.VERSION\n+ }\n+\nfor _, nodePool := range k.Spec.NodePools {\nk.Status.NodePools = append(k.Status.NodePools, v1.NodePoolInfo{\nName: nodePool.Name,\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/apis/kubernikus/v1/kluster.go",
"new_path": "pkg/apis/kubernikus/v1/kluster.go",
"diff": "@@ -32,6 +32,7 @@ type KlusterSpec struct {\nClusterDNSDomain string `json:\"clusterDNSDomain\"`\nServiceCIDR string `json:\"serviceCIDR\"`\nAdvertiseAddress string `json:\"advertiseAddress\"`\n+ Version string `json:\"version\"`\nNodePools []NodePool `json:\"nodePools,omitempty\"`\nOpenstack OpenstackSpec `json:\"openstack,omitempty\"`\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -39,6 +39,7 @@ type kubernikusHelmValues struct {\nServiceCIDR string `yaml:\"serviceCIDR,omitempty\"`\nAdvertiseAddress string `yaml:\"advertiseAddress,omitempty\"`\nBoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\n+ Version string `yaml:\"version,omitempty\"`\nEtcd etcdValues `yaml:\"etcd,omitempty\"`\n}\n@@ -49,6 +50,7 @@ func KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certi\nClusterCIDR: kluster.Spec.ClusterCIDR,\nServiceCIDR: kluster.Spec.ServiceCIDR,\nAdvertiseAddress: kluster.Spec.AdvertiseAddress,\n+ Version: kluster.Spec.Version,\nOpenstack: openstackValues{\nAuthURL: openstack.AuthURL,\nUsername: openstack.Username,\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | passes version through to helm values |
596,240 | 17.10.2017 16:21:50 | -7,200 | 488e674350815de288c8f867f80e87eb2a50b7b5 | burns ingressHost into values | [
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -32,6 +32,10 @@ type etcdValues struct {\nPersistence persistenceValues `yaml:\"persistence,omitempty\"`\n}\n+type apiValues struct {\n+ IngressHost string `yaml:\"ingressHost,omitempty\"`\n+}\n+\ntype kubernikusHelmValues struct {\nOpenstack openstackValues `yaml:\"openstack,omitempty\"`\nCerts map[string]string `yaml:\"certs,omitempty\"`\n@@ -41,6 +45,7 @@ type kubernikusHelmValues struct {\nBoostrapToken string `yaml:\"bootstrapToken,omitempty\"`\nVersion string `yaml:\"version,omitempty\"`\nEtcd etcdValues `yaml:\"etcd,omitempty\"`\n+ Api apiValues `yaml:\"api,omitempty\"`\n}\nfunc KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certificates map[string]string, bootstrapToken string, accessMode string) ([]byte, error) {\n@@ -66,6 +71,9 @@ func KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certi\nAccessMode: accessMode,\n},\n},\n+ Api: apiValues{\n+ IngressHost: kluster.Status.Apiserver,\n+ },\n}\nresult, err := yaml.Marshal(values)\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | burns ingressHost into values |
596,240 | 17.10.2017 16:39:01 | -7,200 | a84fe94d9e16270cd91b710d39bf20911a5d08c5 | just the host... boo. give golang structs for helm values | [
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "package helm\nimport (\n+ \"log\"\n+ \"net/url\"\n+\n\"github.com/sapcc/kubernikus/pkg/apis/kubernikus/v1\"\nyaml \"gopkg.in/yaml.v2\"\n)\n@@ -49,6 +52,11 @@ type kubernikusHelmValues struct {\n}\nfunc KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certificates map[string]string, bootstrapToken string, accessMode string) ([]byte, error) {\n+ ingressURL, err := url.Parse(kluster.Status.Apiserver)\n+ if err != nil {\n+ log.Fatal(err)\n+ }\n+\nvalues := kubernikusHelmValues{\nBoostrapToken: bootstrapToken,\nCerts: certificates,\n@@ -72,7 +80,7 @@ func KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certi\n},\n},\nApi: apiValues{\n- IngressHost: kluster.Status.Apiserver,\n+ IngressHost: ingressURL.Hostname(),\n},\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | just the host... boo. give golang structs for helm values |
596,240 | 17.10.2017 16:55:00 | -7,200 | ce17825b6ee7a2f90e7614c322064fc487200d52 | valid name for cinder default storage class | [
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground/bootstrap.go",
"new_path": "pkg/controller/ground/bootstrap.go",
"diff": "@@ -34,7 +34,7 @@ func SeedKluster(client clientset.Interface) error {\nfunc SeedCinderStorageClass(client clientset.Interface) error {\nstorageClass := storage.StorageClass{\nObjectMeta: metav1.ObjectMeta{\n- Name: \"cinder:default\",\n+ Name: \"cinder-default\",\nAnnotations: map[string]string{\n\"storageclass.kubernetes.io/is-default-class\": \"true\",\n},\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | valid name for cinder default storage class |
596,240 | 17.10.2017 18:04:20 | -7,200 | c355947090f3af9db83dcb27e55057c8216a11c6 | passes-in wormhole host as well as makes fields required | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/configmap.yaml",
"new_path": "charts/kube-master/templates/configmap.yaml",
"diff": "@@ -14,7 +14,7 @@ data:\n- name: local\ncluster:\ncertificate-authority: /etc/kubernetes/certs/tls-ca.pem\n- server: https://{{ .Values.api.ingressHost }}\n+ server: https://{{ required \"missing .api.apiserverHost\" .Values.api.apiserverHost }}\ncontexts:\n- name: local\ncontext:\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/ingress.yaml",
"new_path": "charts/kube-master/templates/ingress.yaml",
"diff": "{{/* vim: set filetype=gotexttmpl: */ -}}\n-{{- if .Values.api.ingressHost }}\n+{{- if .Values.api.apiserverHost }}\napiVersion: extensions/v1beta1\nkind: Ingress\nmetadata:\n@@ -13,14 +13,14 @@ metadata:\nspec:\nrules:\n- - host: {{ .Values.api.ingressHost }}\n+ - host: {{ required \"missing .api.apiserverHost\" .Values.api.apiserverHost }}\nhttp:\npaths:\n- path: /\nbackend:\nserviceName: {{ include \"master.fullname\" . }}\nservicePort: 6443\n- - host: {{ .Values.api.wormholeHost }}\n+ - host: {{ required \"missing .api.wormholeHost\" .Values.api.wormholeHost }}\nhttp:\npaths:\n- path: /\n"
},
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -33,7 +33,8 @@ advertiseAddress: 198.18.127.1\napi:\nreplicaCount: 1\n- # ingressHost:\n+ # apiserverHost:\n+ # wormholeHost:\nresources:\nrequests:\ncpu: 250m\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/helm/helm.go",
"new_path": "pkg/util/helm/helm.go",
"diff": "@@ -36,7 +36,8 @@ type etcdValues struct {\n}\ntype apiValues struct {\n- IngressHost string `yaml:\"ingressHost,omitempty\"`\n+ ApiserverHost string `yaml:\"apiserverHost,omitempty\"`\n+ WormholeHost string `yaml:\"wormholeHost,omitempty\"`\n}\ntype kubernikusHelmValues struct {\n@@ -52,7 +53,12 @@ type kubernikusHelmValues struct {\n}\nfunc KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certificates map[string]string, bootstrapToken string, accessMode string) ([]byte, error) {\n- ingressURL, err := url.Parse(kluster.Status.Apiserver)\n+ apiserverURL, err := url.Parse(kluster.Status.Apiserver)\n+ if err != nil {\n+ log.Fatal(err)\n+ }\n+\n+ wormholeURL, err := url.Parse(kluster.Status.Wormhole)\nif err != nil {\nlog.Fatal(err)\n}\n@@ -80,7 +86,8 @@ func KlusterToHelmValues(kluster *v1.Kluster, openstack *OpenstackOptions, certi\n},\n},\nApi: apiValues{\n- IngressHost: ingressURL.Hostname(),\n+ ApiserverHost: apiserverURL.Hostname(),\n+ WormholeHost: wormholeURL.Hostname(),\n},\n}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | passes-in wormhole host as well as makes fields required |
596,240 | 17.10.2017 19:05:27 | -7,200 | 0204bab1b8b529e14924dd665b30cc7708aa1484 | uses the same default kubernetes service ip everwhere we duplicate it | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/values.yaml",
"new_path": "charts/kube-master/values.yaml",
"diff": "@@ -27,7 +27,7 @@ certs: {}\nclusterCIDR: 198.19.0.0/16\nserviceCIDR: 198.18.128.0/17\n-advertiseAddress: 198.18.127.1\n+advertiseAddress: 198.18.128.1\n#bootstrapToken\n#version:\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/wormhole/client.go",
"new_path": "pkg/cmd/wormhole/client.go",
"diff": "@@ -47,7 +47,7 @@ type ClientOptions struct {\nfunc NewClientOptions() *ClientOptions {\nreturn &ClientOptions{\n- ListenAddr: \"198.18.127.1:6443\",\n+ ListenAddr: \"198.18.128.1:6443\",\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/templates/node.go",
"new_path": "pkg/templates/node.go",
"diff": "@@ -160,7 +160,7 @@ networkd:\nName=kubernikus\n[Network]\nDHCP=no\n- Address=198.18.127.1/32\n+ Address=198.18.128.1/32\nstorage:\nfiles:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | uses the same default kubernetes service ip everwhere we duplicate it |
596,240 | 17.10.2017 19:36:22 | -7,200 | 286b7bdd5696a4124ada175ddbf4db53a9bc62b1 | unified kluster names | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -213,7 +213,7 @@ jobs:\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-staging\n- KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n+ KUBERNIKUS_URL: https://k-staging.admin.cloud.sap\n- name: e2e\nserial: true\n@@ -259,7 +259,7 @@ jobs:\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-eu-nl-1\n- KUBERNIKUS_URL: https://kubernikus-eu-nl-1.admin.cloud.sap\n+ KUBERNIKUS_URL: https://k-eu-nl-1.admin.cloud.sap\non_failure:\n<<: *post_failure_to_slack\n@@ -342,7 +342,7 @@ jobs:\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-staging\n- KUBERNIKUS_URL: https://kubernikus-staging.admin.cloud.sap\n+ KUBERNIKUS_URL: https://k-staging.admin.cloud.sap\n- name: rollout_kubernikus-system\nserial: true\n@@ -372,4 +372,4 @@ jobs:\nOS_PROJECT_NAME: kubernikus\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-eu-nl-1\n- KUBERNIKUS_URL: https://kubernikus-eu-nl-1.admin.cloud.sap\n+ KUBERNIKUS_URL: https://k-eu-nl-1.admin.cloud.sap\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | unified kluster names |
596,240 | 18.10.2017 09:01:07 | -7,200 | 92d40fd05615d9f686ba55fd30ab10dadfad0e8f | removes old codename | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/charts/etcd/templates/deployment.yaml",
"new_path": "charts/kube-master/charts/etcd/templates/deployment.yaml",
"diff": "@@ -44,11 +44,11 @@ spec:\nfieldPath: status.podIP\ncommand: [ etcd ]\nargs:\n- - --name=cke\n+ - --name=kubernikus\n- --data-dir=/var/lib/etcd\n- --advertise-client-urls=http://$(ETCD_IP):2379\n- --initial-advertise-peer-urls=http://$(ETCD_IP):2380\n- - --initial-cluster=cke=http://$(ETCD_IP):2380\n+ - --initial-cluster=kubernikus=http://$(ETCD_IP):2380\n- --listen-client-urls=http://0.0.0.0:2379\n- --listen-peer-urls=http://$(ETCD_IP):2380\n{{- if false }}\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | removes old codename |
596,240 | 18.10.2017 15:57:53 | -7,200 | 7cc229ab7b92e6c912551a31971ec3830f1f41b7 | fixes apiserver readyness check | [
{
"change_type": "MODIFY",
"old_path": "charts/kube-master/templates/api.yaml",
"new_path": "charts/kube-master/templates/api.yaml",
"diff": "@@ -136,9 +136,9 @@ spec:\nreadOnly: true\nreadinessProbe:\nhttpGet:\n- host: 127.0.0.1\npath: /healthz\n- port: 8080\n+ port: 6443\n+ scheme: HTTPS\ninitialDelaySeconds: 15\ntimeoutSeconds: 3\nresources:\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | fixes apiserver readyness check |
596,240 | 18.10.2017 15:58:10 | -7,200 | 1c364f7be90a65db1d8e8aab6784cb991e8e5817 | moves staging to eu-nl-1 | [
{
"change_type": "MODIFY",
"old_path": "ci/pipeline.yaml",
"new_path": "ci/pipeline.yaml",
"diff": "@@ -206,11 +206,11 @@ jobs:\n- task: deploy\nfile: pipeline.git/ci/task_helm_kubernikus.yaml\nparams:\n- OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n- OS_USERNAME: {{kubernikus-staging-username}}\n- OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_AUTH_URL: https://identity-3.eu-nl-1.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-eu-nl-1-username}}\n+ OS_PASSWORD: {{kubernikus-eu-nl-1-password}}\nOS_USER_DOMAIN_NAME: ccadmin\n- OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_NAME: kubernikus-staging\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-staging\nKUBERNIKUS_URL: https://k-staging.admin.cloud.sap\n@@ -335,11 +335,11 @@ jobs:\n- task: deploy\nfile: pipeline.git/ci/task_helm_kubernikus-system.yaml\nparams:\n- OS_AUTH_URL: https://identity-3.staging.cloud.sap/v3\n- OS_USERNAME: {{kubernikus-staging-username}}\n- OS_PASSWORD: {{kubernikus-staging-password}}\n+ OS_AUTH_URL: https://identity-3.eu-nl-1.cloud.sap/v3\n+ OS_USERNAME: {{kubernikus-eu-nl-1-username}}\n+ OS_PASSWORD: {{kubernikus-eu-nl-1-password}}\nOS_USER_DOMAIN_NAME: ccadmin\n- OS_PROJECT_NAME: kubernikus\n+ OS_PROJECT_NAME: kubernikus-staging\nOS_PROJECT_DOMAIN_NAME: ccadmin\nKUBERNIKUS_NAME: k-staging\nKUBERNIKUS_URL: https://k-staging.admin.cloud.sap\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | moves staging to eu-nl-1 |
596,240 | 18.10.2017 18:29:49 | -7,200 | e373ba48ca49ce3a89a981aae042acfce4061805 | allows to provide uids for project and domains | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -64,11 +64,15 @@ func NewCredentialsOptions() *CredentialsOptions {\no.auth = &tokens.AuthOptions{\nIdentityEndpoint: os.Getenv(\"OS_AUTH_URL\"),\nUsername: username,\n+ UserID: os.Getenv(\"OS_USER_ID\"),\nPassword: os.Getenv(\"OS_PASSWORD\"),\n+ DomainID: os.Getenv(\"OS_USER_DOMAIN_ID\"),\nDomainName: os.Getenv(\"OS_USER_DOMAIN_NAME\"),\nAllowReauth: true,\nScope: tokens.Scope{\n+ ProjectID: os.Getenv(\"OS_PROJECT_ID\"),\nProjectName: os.Getenv(\"OS_PROJECT_NAME\"),\n+ DomainID: os.Getenv(\"OS_PROJECT_DOMAIN_ID\"),\nDomainName: os.Getenv(\"OS_PROJECT_DOMAIN_NAME\"),\n},\n}\n@@ -78,10 +82,14 @@ func NewCredentialsOptions() *CredentialsOptions {\nfunc (o *CredentialsOptions) BindFlags(flags *pflag.FlagSet) {\nflags.StringVar(&o.auth.IdentityEndpoint, \"auth-url\", o.auth.IdentityEndpoint, \"Openstack keystone url [OS_AUTH_URL]\")\n- flags.StringVar(&o.auth.Username, \"username\", o.auth.Username, \"User name [OS_USERNAME]\")\n+ flags.StringVar(&o.auth.UserID, \"user-id\", o.auth.UserID, \"User ID [OS_USER_ID]\")\n+ flags.StringVar(&o.auth.Username, \"username\", o.auth.Username, \"User name. Also requires --user-domain-name/--user-domain-id [OS_USERNAME]\")\nflags.StringVar(&o.auth.Password, \"password\", o.auth.Password, \"User password [OS_PASSWORD]\")\n+ flags.StringVar(&o.auth.DomainID, \"user-domain-id\", o.auth.DomainID, \"User domain [OS_USER_DOMAIN_ID]\")\nflags.StringVar(&o.auth.DomainName, \"user-domain-name\", o.auth.DomainName, \"User domain [OS_USER_DOMAIN_NAME]\")\n- flags.StringVar(&o.auth.Scope.ProjectName, \"project-name\", o.auth.Scope.ProjectName, \"Scope to this project [OS_PROJECT_NAME]\")\n+ flags.StringVar(&o.auth.Scope.ProjectID, \"project-id\", o.auth.Scope.ProjectID, \"Scope to this project [OS_PROJECT_ID]\")\n+ flags.StringVar(&o.auth.Scope.ProjectName, \"project-name\", o.auth.Scope.ProjectName, \"Scope to this project. Also requires --project-domain-name/--project-domain-id [OS_PROJECT_NAME]\")\n+ flags.StringVar(&o.auth.Scope.DomainID, \"project-domain-id\", o.auth.Scope.DomainID, \"Domain of the project [OS_PROJECT_DOMAIN_ID]\")\nflags.StringVar(&o.auth.Scope.DomainName, \"project-domain-name\", o.auth.Scope.DomainName, \"Domain of the project [OS_PROJECT_DOMAIN_NAME]\")\nflags.StringVar(&o.url, \"url\", o.url, \"URL for Kubernikus API\")\nflags.StringVar(&o.name, \"name\", o.name, \"Cluster Name\")\n@@ -92,24 +100,24 @@ func (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\nreturn errors.Errorf(\"You need to provide --auth-url or OS_AUTH_URL\")\n}\n- if o.auth.Username == \"\" {\n- return errors.Errorf(\"You need to provide --username or OS_USERNAME\")\n+ if o.auth.Username == \"\" && o.auth.UserID == \"\" {\n+ return errors.Errorf(\"You need to provide --username/--user-id or OS_USERNAME/OS_USER_ID\")\n}\nif o.auth.Password == \"\" {\nreturn errors.Errorf(\"You need to provide --password or OS_PASSWORD\")\n}\n- if o.auth.DomainName == \"\" {\n- return errors.Errorf(\"You need to provide --user-domain-name or OS_USER_DOMAIN_NAME\")\n+ if o.auth.Username != \"\" && o.auth.UserID == \"\" && o.auth.DomainName == \"\" && o.auth.DomainID == \"\" {\n+ return errors.Errorf(\"You need to provide --user-domain-name/--user-domain-id or OS_USER_DOMAIN_NAME/OS_USER_DOMAIN_ID\")\n}\n- if o.auth.Scope.ProjectName == \"\" {\n- return errors.Errorf(\"You need to provide --project-name or OS_PROJECT_NAME\")\n+ if o.auth.Scope.ProjectName == \"\" && o.auth.Scope.ProjectID == \"\" {\n+ return errors.Errorf(\"You need to provide --project-name/--project-id or OS_PROJECT_NAME/OS_PROJECT_ID\")\n}\n- if o.auth.Scope.DomainName == \"\" {\n- return errors.Errorf(\"You need to provide --project-name or OS_PROJECT_DOMAIN_NAME\")\n+ if o.auth.Scope.ProjectName != \"\" && o.auth.Scope.ProjectID == \"\" && o.auth.Scope.DomainName == \"\" && o.auth.DomainID == \"\" {\n+ return errors.Errorf(\"You need to provide --project-domain-name/--project-domain-id or OS_PROJECT_DOMAIN_NAME/OS_PROJECT_DOMAIN_ID\")\n}\nreturn nil\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | allows to provide uids for project and domains |
596,240 | 19.10.2017 16:30:27 | -7,200 | 0c25a5b9d42f094a22aa1666359ab6c4ff32425d | sprinkles fairy dust on the credentials command to make many parameters optional | [
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "package kubernikusctl\nimport (\n+ \"crypto/x509\"\n+ \"encoding/pem\"\n\"fmt\"\n\"net/url\"\n\"os\"\n+ \"strings\"\n\"github.com/go-openapi/runtime\"\n\"github.com/go-openapi/strfmt\"\n@@ -16,6 +19,7 @@ import (\nkubernikus \"github.com/sapcc/kubernikus/pkg/client/kubernikus_generated\"\n\"github.com/sapcc/kubernikus/pkg/client/kubernikus_generated/operations\"\n\"github.com/sapcc/kubernikus/pkg/cmd\"\n+ \"github.com/sapcc/kubernikus/pkg/util\"\n\"github.com/spf13/cobra\"\n\"github.com/spf13/pflag\"\n\"k8s.io/client-go/tools/clientcmd\"\n@@ -43,6 +47,8 @@ func NewCredentialsCommand() *cobra.Command {\ntype CredentialsOptions struct {\nurl string\nname string\n+ kubeconfigPath string\n+ context string\nkubernikus *kubernikus.Kubernikus\nauth *tokens.AuthOptions\n@@ -52,18 +58,13 @@ type CredentialsOptions struct {\n}\nfunc NewCredentialsOptions() *CredentialsOptions {\n- username := os.Getenv(\"OS_USERNAME\")\n- if username == \"\" {\n- username = os.Getenv(\"USER\")\n- }\n-\no := &CredentialsOptions{\nname: os.Getenv(\"KUBERNIKUS_NAME\"),\nurl: os.Getenv(\"KUBERNIKUS_URL\"),\n}\no.auth = &tokens.AuthOptions{\nIdentityEndpoint: os.Getenv(\"OS_AUTH_URL\"),\n- Username: username,\n+ Username: os.Getenv(\"OS_USERNAME\"),\nUserID: os.Getenv(\"OS_USER_ID\"),\nPassword: os.Getenv(\"OS_PASSWORD\"),\nDomainID: os.Getenv(\"OS_USER_DOMAIN_ID\"),\n@@ -93,9 +94,125 @@ func (o *CredentialsOptions) BindFlags(flags *pflag.FlagSet) {\nflags.StringVar(&o.auth.Scope.DomainName, \"project-domain-name\", o.auth.Scope.DomainName, \"Domain of the project [OS_PROJECT_DOMAIN_NAME]\")\nflags.StringVar(&o.url, \"url\", o.url, \"URL for Kubernikus API\")\nflags.StringVar(&o.name, \"name\", o.name, \"Cluster Name\")\n+ flags.StringVar(&o.kubeconfigPath, \"kubeconfig\", o.kubeconfigPath, \"Overwrites kubeconfig auto-detection with explicit path\")\n+ flags.StringVar(&o.context, \"context\", o.context, \"Overwrites current-context in kubeconfig\")\n}\nfunc (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\n+ return nil\n+}\n+\n+func (o *CredentialsOptions) Complete(args []string) error {\n+ if len(args) == 1 {\n+ o.name = args[0]\n+ }\n+\n+ return nil\n+}\n+\n+func (o *CredentialsOptions) Run(c *cobra.Command) error {\n+ var err error\n+\n+ // Collect Starting Kubeconfig\n+ // if current context is a kubernikus context\n+ // if ! expired(client certificate) && ! --force\n+ // return\n+ // else\n+ // guess auth-url/projectID/kubernikusHost from CA certificate\n+ // guess username/domainName from client certificate\n+ // authenticate\n+ // unless --name guess kluster name\n+ // unless --url auto-detect kubernikus url\n+ // fetch credentials\n+ // update kubeconfigs\n+\n+ if o.kubeconfigPath == \"\" {\n+ o.kubeconfigPath = clientcmd.NewDefaultPathOptions().GetDefaultFilename()\n+ }\n+\n+ if o.kubeconfigPath != \"\" {\n+ if err := o.loadKubeconfig(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ return errors.Errorf(\"Loading of the specified kubeconfig failed\")\n+ }\n+ glog.V(2).Infof(\"Loaded kubeconfig from %v\", o.kubeconfigPath)\n+ }\n+\n+ if o.context == \"\" && o.kubeconfig.CurrentContext != \"\" {\n+ o.context = o.kubeconfig.CurrentContext\n+ }\n+\n+ if o.isContextValid() {\n+ glog.V(2).Infof(\"Using context %v\", o.context)\n+ isKubernikusContext := false\n+ if isKubernikusContext, err = o.isKubernikusContext(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Detection of Kubernikus issued certificates failed\")\n+ }\n+\n+ if isKubernikusContext {\n+ ok := false\n+ if ok, err = o.isCertificateValid(); err != nil {\n+ glog.V(3).Infof(\"%+v\", err)\n+ }\n+ if ok {\n+ return nil\n+ }\n+\n+ if o.auth.IdentityEndpoint == \"\" {\n+ if identityEndpoint, err := o.autoDetectAuthURL(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Auto-Detection of auth-url caused an error\")\n+ } else {\n+ o.auth.IdentityEndpoint = identityEndpoint\n+ glog.V(2).Infof(\"Detected auth-url: %v\", o.auth.IdentityEndpoint)\n+ }\n+ }\n+\n+ if o.auth.Scope.ProjectName == \"\" || o.auth.Scope.ProjectID == \"\" {\n+ if projectID, err := o.autoDetectProjectID(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Auto-Detection of project scope caused an error\")\n+ } else {\n+ o.auth.Scope.ProjectID = projectID\n+ glog.V(2).Infof(\"Detected authentication scope for project-id: %v\", o.auth.Scope.ProjectID)\n+ }\n+ }\n+\n+ if o.url == \"\" {\n+ if url, err := o.autoDetectKubernikusURL(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Auto-Detection of Kubernikus URL caused an error\")\n+ } else {\n+ o.url = url\n+ glog.V(2).Infof(\"Detected Kubernikus URL: %v\", o.url)\n+ }\n+ }\n+\n+ if o.auth.Username == \"\" {\n+ if username, err := o.autoDetectUsername(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Auto-Detection of Username failed\")\n+ } else {\n+ o.auth.Username = username\n+ glog.V(2).Infof(\"Detected username: %v\", o.auth.Username)\n+ }\n+ }\n+\n+ if o.auth.DomainName == \"\" {\n+ if domainName, err := o.autoDetectUserDomainName(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\n+ glog.V(2).Infof(\"Auto-Detection of user-domain-name failed\")\n+ } else {\n+ o.auth.DomainName = domainName\n+ glog.V(2).Infof(\"Detected domain-name: %v\", o.auth.DomainName)\n+ }\n+ }\n+ }\n+ } else {\n+ glog.V(2).Infof(\"Unkown context %v. Ignoring it.\", o.context)\n+ }\n+\nif o.auth.IdentityEndpoint == \"\" {\nreturn errors.Errorf(\"You need to provide --auth-url or OS_AUTH_URL\")\n}\n@@ -120,39 +237,43 @@ func (o *CredentialsOptions) Validate(c *cobra.Command, args []string) error {\nreturn errors.Errorf(\"You need to provide --project-domain-name/--project-domain-id or OS_PROJECT_DOMAIN_NAME/OS_PROJECT_DOMAIN_ID\")\n}\n- return nil\n-}\n-\n-func (o *CredentialsOptions) Complete(args []string) error {\n- var err error\n-\n- if err := o.setupKubeconfig(); err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n- return errors.Errorf(\"No existing kubeconfig was found\")\n- }\n-\nif err := o.setupOpenstackClients(); err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ glog.V(3).Infof(\"%+v\", err)\nreturn errors.Errorf(\"Openstack clients couldn't be created\")\n}\n- fmt.Printf(\"Authenticating %v/%v at %v/%v\\n\", o.auth.DomainName, o.auth.Username, o.auth.Scope.DomainName, o.auth.Scope.ProjectName)\n+ glog.V(2).Infof(\"Using AuthOptions:\")\n+ glog.V(2).Infof(\" IdentityEndpoint: %v\", o.auth.IdentityEndpoint)\n+ glog.V(2).Infof(\" Username: %v\", o.auth.Username)\n+ glog.V(2).Infof(\" UserID: %v\", o.auth.UserID)\n+ glog.V(2).Infof(\" Password: %v\", o.auth.Password)\n+ glog.V(2).Infof(\" DomainID: %v\", o.auth.DomainID)\n+ glog.V(2).Infof(\" DomainName: %v\", o.auth.DomainName)\n+ glog.V(2).Infof(\" Scope:\")\n+ glog.V(2).Infof(\" ProjectID: %v\", o.auth.Scope.ProjectID)\n+ glog.V(2).Infof(\" ProjectName: %v\", o.auth.Scope.ProjectName)\n+ glog.V(2).Infof(\" DomainID: %v\", o.auth.Scope.DomainID)\n+ glog.V(2).Infof(\" DomainName: %v\", o.auth.Scope.DomainName)\n+ fmt.Println(o.printAuthInfo())\n+\nif err := o.authenticate(); err != nil {\n- glog.V(2).Infof(\"%#v\", err)\n+ glog.V(3).Infof(\"%#v\", err)\nreturn errors.Errorf(\"Authentication failed\")\n}\nif o.url == \"\" {\n- fmt.Println(\"Auto-Detectng Kubernikus Host...\")\n- if o.url, err = o.autoDetectKubernikusHost(); err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ if url, err := o.autoDetectKubernikusURLFromServiceCatalog(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\nreturn errors.Errorf(\"You need to provide --url. Auto-Detection failed\")\n+ } else {\n+ o.url = url\n+ glog.V(2).Infof(\"Detected Kubernikus URL: %v\", url)\n}\n}\nurl, err := url.Parse(o.url)\nif err != nil {\n- glog.V(2).Infof(\"%#v\", err)\n+ glog.V(3).Infof(\"%v\", err)\nreturn errors.Errorf(\"The URL for the Kubernikus API is not parsable\")\n}\n@@ -162,32 +283,26 @@ func (o *CredentialsOptions) Complete(args []string) error {\nWithBasePath(url.EscapedPath())\no.kubernikus = kubernikus.NewHTTPClientWithConfig(nil, transport)\n- if len(args) == 1 {\n- o.name = args[0]\n- }\n-\nif o.name == \"\" {\n- fmt.Println(\"Auto-Detecting Kubernikus Cluster...\")\n- if o.name, err = o.autoDetectClusterName(); err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ if name, err := o.autoDetectClusterName(); err != nil {\n+ glog.V(3).Infof(\"%v\", err)\nreturn errors.Errorf(\"You need to provide --host. Auto-Detection failed\")\n+ } else {\n+ o.name = name\n+ glog.V(2).Infof(\"Detected cluster name: %v\", name)\n}\n}\n- return nil\n-}\n-\n-func (o *CredentialsOptions) Run(c *cobra.Command) error {\n- fmt.Printf(\"Fetching credentials for %v/%v/%v from %v\\n\", o.auth.Scope.DomainName, o.auth.Scope.ProjectName, o.name, o.url)\n+ fmt.Printf(\"Fetching credentials for %v from %v\\n\", o.name, o.url)\nkubeconfig, err := o.fetchCredentials()\nif err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ glog.V(3).Infof(\"%v\", err)\nreturn errors.Wrap(err, \"Couldn't fetch credentials from Kubernikus API\")\n}\nerr = o.mergeAndPersist(kubeconfig)\nif err != nil {\n- glog.V(2).Infof(\"%+v\", err)\n+ glog.V(3).Infof(\"%v\", err)\nreturn errors.Errorf(\"Couldn't merge existing kubeconfig with fetched credentials\")\n}\n@@ -196,14 +311,189 @@ func (o *CredentialsOptions) Run(c *cobra.Command) error {\nreturn nil\n}\n-func (o *CredentialsOptions) setupKubeconfig() error {\n- var err error\n+func (o *CredentialsOptions) loadKubeconfig() (err error) {\n+ if o.kubeconfig, err = clientcmd.LoadFromFile(o.kubeconfigPath); err != nil {\n+ return errors.Wrapf(err, \"Failed to load kubeconfig from %v\", o.kubeconfigPath)\n+ }\n+ return nil\n+}\n- if o.kubeconfig, err = clientcmd.NewDefaultPathOptions().GetStartingConfig(); err != nil {\n- return errors.Wrap(err, \"Getting starting config failed\")\n+func (o *CredentialsOptions) isContextValid() bool {\n+ if o.context == \"\" {\n+ return false\n+ }\n+ return o.kubeconfig.Contexts[o.context] != nil\n}\n- return nil\n+func (o *CredentialsOptions) isKubernikusContext() (bool, error) {\n+ caCert, err := o.getCACertifciate()\n+ if err != nil {\n+ return false, err\n+ }\n+\n+ if len(caCert.Issuer.OrganizationalUnit) < 2 {\n+ return false, nil\n+ }\n+\n+ return caCert.Issuer.OrganizationalUnit[0] == util.CA_ISSUER_KUBERNIKUS_IDENTIFIER_0 &&\n+ caCert.Issuer.OrganizationalUnit[1] == util.CA_ISSUER_KUBERNIKUS_IDENTIFIER_1, nil\n+}\n+\n+func (o *CredentialsOptions) autoDetectKubernikusCAMetadata(index int) (string, error) {\n+ cert, err := o.getCACertifciate()\n+ if err != nil {\n+ return \"\", err\n+ }\n+ if len(cert.Issuer.Province) < 1 {\n+ return \"\", errors.Errorf(\"CA certificate didn't contain Kubernikus metadata\")\n+ }\n+ if index > 1 {\n+ return \"\", errors.Errorf(\"Invalid Metadata\")\n+ }\n+ return cert.Issuer.Province[index], nil\n+}\n+\n+func (o *CredentialsOptions) autoDetectKubernikusClientMetadata() (string, string, error) {\n+ cert, err := o.getClientCertificate()\n+ if err != nil {\n+ return \"\", \"\", err\n+ }\n+ if cert.Subject.CommonName == \"\" {\n+ return \"\", \"\", errors.Errorf(\"Client certificate didn't contain username\")\n+ }\n+\n+ parts := strings.Split(cert.Subject.CommonName, \"@\")\n+ if len(parts) != 2 {\n+ return \"\", \"\", errors.Errorf(\"Couldln't extract username/domain from client certificate %v\", parts)\n+ }\n+\n+ return parts[0], parts[1], nil\n+}\n+\n+func (o *CredentialsOptions) autoDetectAuthURL() (string, error) {\n+ return o.autoDetectKubernikusCAMetadata(0)\n+}\n+\n+func (o *CredentialsOptions) autoDetectProjectID() (string, error) {\n+ return o.autoDetectKubernikusCAMetadata(1)\n+}\n+\n+func (o *CredentialsOptions) autoDetectKubernikusURL() (string, error) {\n+ cert, err := o.getCACertifciate()\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ if len(cert.Issuer.Locality) == 0 {\n+ return \"\", errors.Errorf(\"CA certificate didn't contain Kubernikus metadata\")\n+ }\n+ return cert.Issuer.Locality[0], nil\n+}\n+\n+func (o *CredentialsOptions) autoDetectUsername() (string, error) {\n+ user, _, err := o.autoDetectKubernikusClientMetadata()\n+ if err != nil {\n+ return \"\", err\n+ }\n+ return user, nil\n+}\n+\n+func (o *CredentialsOptions) autoDetectUserDomainName() (string, error) {\n+ _, domain, err := o.autoDetectKubernikusClientMetadata()\n+ if err != nil {\n+ return \"\", err\n+ }\n+ return domain, nil\n+}\n+\n+func (o *CredentialsOptions) getRawClientCertificate() ([]byte, error) {\n+ context := o.kubeconfig.Contexts[o.context]\n+ if context == nil {\n+ return nil, errors.Errorf(\"Couldn't find context %v\", o.context)\n+ }\n+\n+ authInfo := o.kubeconfig.AuthInfos[context.AuthInfo]\n+ if authInfo == nil {\n+ return nil, errors.Errorf(\"Couldn't find auth-info %v for context %v\", context.AuthInfo, o.context)\n+ }\n+\n+ cluster := o.kubeconfig.Clusters[context.Cluster]\n+ if cluster == nil {\n+ return nil, errors.Errorf(\"Couldn't find cluster %v\", context.Cluster)\n+ }\n+\n+ certData := authInfo.ClientCertificateData\n+ if certData == nil {\n+ return nil, errors.Errorf(\"Couldn't find client certificate for auth-info %v\", authInfo.Username)\n+ }\n+\n+ return certData, nil\n+}\n+\n+func (o *CredentialsOptions) getRawCACertificate() ([]byte, error) {\n+ context := o.kubeconfig.Contexts[o.context]\n+ if context == nil {\n+ return nil, errors.Errorf(\"Couldn't find context %v\", o.context)\n+ }\n+\n+ authInfo := o.kubeconfig.AuthInfos[context.AuthInfo]\n+ if authInfo == nil {\n+ return nil, errors.Errorf(\"Couldn't find auth-info %v for context %v\", context.AuthInfo, o.context)\n+ }\n+\n+ cluster := o.kubeconfig.Clusters[context.Cluster]\n+ if cluster == nil {\n+ return nil, errors.Errorf(\"Couldn't find cluster %v\", context.Cluster)\n+ }\n+\n+ certData := cluster.CertificateAuthorityData\n+ if certData == nil {\n+ return nil, errors.Errorf(\"Couldn't find CA certificate for cluster %v\", context.Cluster)\n+ }\n+\n+ return certData, nil\n+}\n+\n+func (o *CredentialsOptions) getCACertifciate() (*x509.Certificate, error) {\n+ data, err := o.getRawCACertificate()\n+ if err != nil {\n+ return nil, err\n+ }\n+ return parseRawPEM(data)\n+}\n+\n+func (o *CredentialsOptions) getClientCertificate() (*x509.Certificate, error) {\n+ data, err := o.getRawClientCertificate()\n+ if err != nil {\n+ return nil, err\n+ }\n+ return parseRawPEM(data)\n+}\n+\n+func (o *CredentialsOptions) isCertificateValid() (bool, error) {\n+ caData, err := o.getRawCACertificate()\n+ if err != nil {\n+ return false, err\n+ }\n+\n+ cert, err := o.getClientCertificate()\n+ if err != nil {\n+ return false, err\n+ }\n+\n+ caCertPool := x509.NewCertPool()\n+ caCertPool.AppendCertsFromPEM(caData)\n+\n+ opts := x509.VerifyOptions{\n+ Roots: caCertPool,\n+ KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},\n+ }\n+\n+ if _, err := cert.Verify(opts); err != nil {\n+ return false, nil\n+ }\n+\n+ return true, nil\n}\nfunc (o *CredentialsOptions) setupOpenstackClients() error {\n@@ -228,7 +518,7 @@ func (o *CredentialsOptions) authenticate() error {\nreturn nil\n}\n-func (o *CredentialsOptions) autoDetectKubernikusHost() (string, error) {\n+func (o *CredentialsOptions) autoDetectKubernikusURLFromServiceCatalog() (string, error) {\ncatalog, err := tokens.Create(o.identity, o.auth).ExtractServiceCatalog()\nif err != nil {\nreturn \"\", errors.Wrap(err, \"Couldn't fetch service catalog\")\n@@ -319,3 +609,43 @@ func (o *CredentialsOptions) mergeAndPersist(rawConfig string) error {\nreturn nil\n}\n+\n+func (o *CredentialsOptions) printAuthInfo() string {\n+ var user, scope string\n+\n+ if o.auth.UserID != \"\" {\n+ user = o.auth.UserID\n+ } else {\n+ if o.auth.DomainID != \"\" {\n+ user = fmt.Sprintf(\"%v/%v\", o.auth.DomainID, o.auth.Username)\n+ } else {\n+ user = fmt.Sprintf(\"%v/%v\", o.auth.DomainName, o.auth.Username)\n+ }\n+ }\n+\n+ if o.auth.Scope.ProjectID != \"\" {\n+ scope = o.auth.Scope.ProjectID\n+ } else {\n+ if o.auth.Scope.DomainID != \"\" {\n+ scope = fmt.Sprintf(\"%v/%v\", o.auth.Scope.DomainID, o.auth.Scope.ProjectName)\n+ } else {\n+ scope = fmt.Sprintf(\"%v/%v\", o.auth.Scope.DomainName, o.auth.Scope.ProjectName)\n+ }\n+ }\n+\n+ return fmt.Sprintf(\"Authenticating %v at %v\", user, scope)\n+}\n+\n+func parseRawPEM(data []byte) (*x509.Certificate, error) {\n+ block, _ := pem.Decode(data)\n+ if block == nil {\n+ return nil, errors.New(\"Couldn't decode raw certificate\")\n+ }\n+\n+ cert, err := x509.ParseCertificate(block.Bytes)\n+ if err != nil {\n+ return nil, errors.Wrapf(err, \"Couldn't parse certificate\")\n+ }\n+\n+ return cert, nil\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/certificates.go",
"new_path": "pkg/util/certificates.go",
"diff": "@@ -275,7 +275,7 @@ func createEnrichedCA(kluster *v1.Kluster, authURL, common_name string, bundle *\nSerialNumber: new(big.Int).SetInt64(0),\nSubject: pkix.Name{\nCommonName: common_name,\n- OrganizationalUnit: []string{\"SAP Converged Cloud\", \"Kubernikus\", kluster.Name},\n+ OrganizationalUnit: []string{CA_ISSUER_KUBERNIKUS_IDENTIFIER_0, CA_ISSUER_KUBERNIKUS_IDENTIFIER_1, kluster.Name},\nProvince: []string{authURL, kluster.Spec.Openstack.ProjectID},\nLocality: []string{kluster.Status.Apiserver},\n},\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "pkg/util/constants.go",
"diff": "+package util\n+\n+const (\n+ CA_ISSUER_KUBERNIKUS_IDENTIFIER_0 = \"SAP Converged Cloud\"\n+ CA_ISSUER_KUBERNIKUS_IDENTIFIER_1 = \"Kubernikus\"\n+)\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | sprinkles fairy dust on the credentials command to make many parameters optional |
596,240 | 19.10.2017 17:30:19 | -7,200 | 560cec6151990d31f8b65606735d6a029ca11b62 | retrieves kubernikus url from service catalog for credentials metadata | [
{
"change_type": "MODIFY",
"old_path": "pkg/client/openstack/client.go",
"new_path": "pkg/client/openstack/client.go",
"diff": "@@ -58,6 +58,7 @@ type Client interface {\nGetRouters(project_id string) ([]Router, error)\nDeleteUser(username, domainID string) error\nCreateKlusterServiceUser(username, password, domain, defaultProjectID string) error\n+ GetKubernikusCatalogEntry() (string, error)\n}\ntype Project struct {\n@@ -679,3 +680,32 @@ func ExtractServers(r pagination.Page) ([]Node, error) {\nerr := servers.ExtractServersInto(r, &s)\nreturn s, err\n}\n+\n+func (c *client) GetKubernikusCatalogEntry() (string, error) {\n+ provider, err := c.adminClient()\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ identity, err := openstack.NewIdentityV3(provider, gophercloud.EndpointOpts{})\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ catalog, err := tokens.Get(identity, provider.TokenID).ExtractServiceCatalog()\n+ if err != nil {\n+ return \"\", err\n+ }\n+\n+ for _, service := range catalog.Entries {\n+ if service.Type == \"kubernikus\" {\n+ for _, endpoint := range service.Endpoints {\n+ if endpoint.Interface == \"public\" {\n+ return endpoint.URL, nil\n+ }\n+ }\n+ }\n+ }\n+\n+ return \"\", err\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/files.go",
"new_path": "pkg/cmd/kubernikus/certificates/files.go",
"diff": "@@ -60,7 +60,7 @@ func (o *FilesOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- certificates := util.CreateCertificates(kluster, \"https://identity.openstack.com\", \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"https://api.kubernikus.cloud.sap\", \"https://identity.openstack.com\", \"kubernikus.cloud.sap\")\nif err := NewFilePersister(\".\").WriteConfig(certificates); err != nil {\nreturn err\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/certificates/plain.go",
"new_path": "pkg/cmd/kubernikus/certificates/plain.go",
"diff": "@@ -54,7 +54,7 @@ func (o *PlainOptions) Run(c *cobra.Command) error {\nreturn err\n}\n- certificates := util.CreateCertificates(kluster, \"https://auth.openstack.com\", \"kubernikus.cloud.sap\")\n+ certificates := util.CreateCertificates(kluster, \"https://api.kubernikus.cloud.sap\", \"https://auth.openstack.com\", \"kubernikus.cloud.sap\")\nif err := NewPlainPersister().WriteConfig(certificates); err != nil {\nreturn err\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikus/helm.go",
"new_path": "pkg/cmd/kubernikus/helm.go",
"diff": "@@ -42,6 +42,7 @@ type HelmOptions struct {\nAuthProject string\nAuthProjectDomain string\nProjectID string\n+ KubernikusAPI string\n}\nfunc NewHelmOptions() *HelmOptions {\n@@ -60,6 +61,7 @@ func (o *HelmOptions) BindFlags(flags *pflag.FlagSet) {\nflags.StringVar(&o.AuthProject, \"auth-project\", o.AuthProject, \"Scope service user to this project\")\nflags.StringVar(&o.AuthProjectDomain, \"auth-project-domain\", o.AuthProjectDomain, \"Domain of the project\")\nflags.StringVar(&o.ProjectID, \"project-id\", o.ProjectID, \"Project ID where the kublets will be running\")\n+ flags.StringVar(&o.KubernikusAPI, \"api\", o.KubernikusAPI, \"Kubernikus API URL. e.g. https://kubernikus.eu-nl-1.cloud.sap\")\n}\nfunc (o *HelmOptions) Validate(c *cobra.Command, args []string) error {\n@@ -81,6 +83,10 @@ func (o *HelmOptions) Validate(c *cobra.Command, args []string) error {\n}\n}\n+ if o.KubernikusAPI == \"\" {\n+ return errors.New(\"--api is required\")\n+ }\n+\nreturn nil\n}\n@@ -108,7 +114,7 @@ func (o *HelmOptions) Run(c *cobra.Command) error {\nDomainName: o.AuthDomain,\n}\n- certificates := util.CreateCertificates(kluster, o.AuthURL, nameA[1])\n+ certificates := util.CreateCertificates(kluster, o.KubernikusAPI, o.AuthURL, nameA[1])\ntoken := util.GenerateBootstrapToken()\nresult, err := helm.KlusterToHelmValues(kluster, options, certificates, token, \"\")\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/cmd/kubernikusctl/credenitals.go",
"new_path": "pkg/cmd/kubernikusctl/credenitals.go",
"diff": "@@ -169,7 +169,7 @@ func (o *CredentialsOptions) Run(c *cobra.Command) error {\n}\n}\n- if o.auth.Scope.ProjectName == \"\" || o.auth.Scope.ProjectID == \"\" {\n+ if o.auth.Scope.ProjectName == \"\" && o.auth.Scope.ProjectID == \"\" {\nif projectID, err := o.autoDetectProjectID(); err != nil {\nglog.V(3).Infof(\"%v\", err)\nglog.V(2).Infof(\"Auto-Detection of project scope caused an error\")\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/controller/ground.go",
"new_path": "pkg/controller/ground.go",
"diff": "@@ -271,7 +271,13 @@ func (op *GroundControl) createKluster(tpr *v1.Kluster) error {\nif err != nil {\nreturn fmt.Errorf(\"Couldn't determine access mode for pvc: %s\", err)\n}\n- certificates := util.CreateCertificates(tpr, op.Config.Openstack.AuthURL, op.Config.Kubernikus.Domain)\n+\n+ apiURL, err := op.Clients.Openstack.GetKubernikusCatalogEntry()\n+ if err != nil {\n+ return fmt.Errorf(\"Couldn't determine kubernikus api from service catalog: %s\", err)\n+ }\n+\n+ certificates := util.CreateCertificates(tpr, apiURL, op.Config.Openstack.AuthURL, op.Config.Kubernikus.Domain)\nbootstrapToken := util.GenerateBootstrapToken()\nusername := fmt.Sprintf(\"kubernikus-%s\", tpr.Name)\npassword, err := goutils.Random(20, 32, 127, true, true)\n"
},
{
"change_type": "MODIFY",
"old_path": "pkg/util/certificates.go",
"new_path": "pkg/util/certificates.go",
"diff": "@@ -164,7 +164,7 @@ func (c Certificates) all() []Bundle {\n}\n}\n-func CreateCertificates(kluster *v1.Kluster, authURL, domain string) map[string]string {\n+func CreateCertificates(kluster *v1.Kluster, apiURL, authURL, domain string) map[string]string {\ncerts := &Certificates{}\ncreateCA(kluster.Name, \"Etcd Clients\", &certs.Etcd.Clients.CA)\ncreateCA(kluster.Name, \"Etcd Peers\", &certs.Etcd.Peers.CA)\n@@ -172,7 +172,7 @@ func CreateCertificates(kluster *v1.Kluster, authURL, domain string) map[string]\ncreateCA(kluster.Name, \"ApiServer Nodes\", &certs.ApiServer.Nodes.CA)\ncreateCA(kluster.Name, \"Kubelet Clients\", &certs.Kubelet.Clients.CA)\ncreateCA(kluster.Name, \"TLS\", &certs.TLS.CA)\n- createEnrichedCA(kluster, authURL, \"TLS\", &certs.TLS.CA)\n+ createEnrichedCA(kluster, apiURL, authURL, \"TLS\", &certs.TLS.CA)\ncerts.Etcd.Clients.ApiServer = certs.signEtcdClient(\"apiserver\")\ncerts.Etcd.Peers.Universal = certs.signEtcdPeer(\"universal\")\n@@ -267,7 +267,7 @@ func createCA(satellite, name string, bundle *Bundle) {\nbundle.Certificate, _ = x509.ParseCertificate(certDERBytes)\n}\n-func createEnrichedCA(kluster *v1.Kluster, authURL, common_name string, bundle *Bundle) {\n+func createEnrichedCA(kluster *v1.Kluster, kubernikusAPIURL, authURL, common_name string, bundle *Bundle) {\nbundle.PrivateKey, _ = certutil.NewPrivateKey()\nnow := time.Now()\n"
}
]
| Go | Apache License 2.0 | sapcc/kubernikus | retrieves kubernikus url from service catalog for credentials metadata |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.