Skip to content

Commit 0cb6055

Browse files
authored
Glide up & add mattes/migrate (#63)
* glide up * glide add github.com/mattes/migrate * update git2go to v24
1 parent df60001 commit 0cb6055

File tree

3,211 files changed

+320530
-267448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,211 files changed

+320530
-267448
lines changed

server/glide.lock

+45-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/glide.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import:
1010
- spew
1111
- package: github.com/dgrijalva/jwt-go
1212
- package: github.com/docker/docker
13-
version: docs-v1.12.0-rc4-2016-07-15-4385-gbf8cdb9
1413
subpackages:
1514
- pkg/archive
1615
- package: github.com/extemporalgenome/slug
@@ -23,21 +22,20 @@ import:
2322
subpackages:
2423
- jwk
2524
- package: github.com/libgit2/git2go
26-
version: b8a9efd
25+
version: v24
2726
- package: github.com/maxwellhealth/bongo
2827
- package: github.com/pborman/uuid
2928
- package: github.com/spf13/cobra
3029
- package: github.com/spf13/viper
31-
version: 5ed0fc3
3230
- package: golang.org/x/crypto
33-
version: 5b4074c
31+
version: master
3432
subpackages:
3533
- ssh
3634
- package: gopkg.in/mgo.v2
3735
subpackages:
3836
- bson
3937
- package: k8s.io/client-go
40-
version: v2.0.0-alpha.0-23-g24a02a6
38+
version: release-2.0
4139
subpackages:
4240
- kubernetes
4341
- kubernetes/typed/core/v1
@@ -50,4 +48,4 @@ import:
5048
- pkg/util/intstr
5149
- tools/clientcmd
5250
- package: github.com/ashwanthkumar/slack-go-webhook
53-
version: 6174793
51+
- package: github.com/mattes/migrate

server/plugins/kubedeploy/deployments.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"time"
1010

1111
"k8s.io/client-go/kubernetes"
12-
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
12+
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
1313
"k8s.io/client-go/pkg/api/errors"
1414
"k8s.io/client-go/pkg/api/resource"
15+
"k8s.io/client-go/pkg/api/unversioned"
1516
"k8s.io/client-go/pkg/api/v1"
1617
"k8s.io/client-go/pkg/apis/extensions/v1beta1"
17-
metav1 "k8s.io/client-go/pkg/apis/meta/v1"
1818
"k8s.io/client-go/pkg/util"
1919
"k8s.io/client-go/pkg/util/intstr"
2020
"k8s.io/client-go/tools/clientcmd"
@@ -75,17 +75,17 @@ func secretifyDockerCred() string {
7575
return jsonFilled
7676
}
7777

78-
func (x *KubeDeploy) createDockerIOSecretIfNotExists(namespace string, coreInterface v1core.CoreV1Interface) error {
78+
func (x *KubeDeploy) createDockerIOSecretIfNotExists(namespace string, coreInterface corev1.CoreV1Interface) error {
7979
// Load up the docker-io secrets for image pull if not exists
80-
_, dockerIOSecretErr := coreInterface.Secrets(namespace).Get("docker-io", metav1.GetOptions{})
80+
_, dockerIOSecretErr := coreInterface.Secrets(namespace).Get("docker-io")
8181
if dockerIOSecretErr != nil {
8282
if errors.IsNotFound(dockerIOSecretErr) {
8383
log.Printf("docker-io secret not found for %s, creating.", namespace)
8484
secretMap := map[string]string{
8585
".dockercfg": secretifyDockerCred(),
8686
}
8787
_, createDockerIOSecretErr := coreInterface.Secrets(namespace).Create(&v1.Secret{
88-
TypeMeta: metav1.TypeMeta{
88+
TypeMeta: unversioned.TypeMeta{
8989
Kind: "Secret",
9090
APIVersion: "v1",
9191
},
@@ -108,14 +108,14 @@ func (x *KubeDeploy) createDockerIOSecretIfNotExists(namespace string, coreInter
108108
return nil
109109
}
110110

111-
func (x *KubeDeploy) createNamespaceIfNotExists(namespace string, coreInterface v1core.CoreV1Interface) error {
111+
func (x *KubeDeploy) createNamespaceIfNotExists(namespace string, coreInterface corev1.CoreV1Interface) error {
112112
// Create namespace if it does not exist.
113-
_, nameGetErr := coreInterface.Namespaces().Get(namespace, metav1.GetOptions{})
113+
_, nameGetErr := coreInterface.Namespaces().Get(namespace)
114114
if nameGetErr != nil {
115115
if errors.IsNotFound(nameGetErr) {
116116
log.Printf("Namespace %s does not yet exist, creating.", namespace)
117117
namespaceParams := &v1.Namespace{
118-
TypeMeta: metav1.TypeMeta{
118+
TypeMeta: unversioned.TypeMeta{
119119
Kind: "Namespace",
120120
APIVersion: "v1",
121121
},
@@ -189,7 +189,7 @@ func (x *KubeDeploy) doDeploy(e agent.Event) error {
189189
}
190190

191191
secretParams := &v1.Secret{
192-
TypeMeta: metav1.TypeMeta{
192+
TypeMeta: unversioned.TypeMeta{
193193
Kind: "Secret",
194194
APIVersion: "v1",
195195
},
@@ -378,7 +378,7 @@ func (x *KubeDeploy) doDeploy(e agent.Event) error {
378378
var revisionHistoryLimit int32 = 10
379379
terminationGracePeriodSeconds := service.Spec.TerminationGracePeriodSeconds
380380
deployParams := &v1beta1.Deployment{
381-
TypeMeta: metav1.TypeMeta{
381+
TypeMeta: unversioned.TypeMeta{
382382
Kind: "Deployment",
383383
APIVersion: "extensions/v1beta1",
384384
},
@@ -435,7 +435,7 @@ func (x *KubeDeploy) doDeploy(e agent.Event) error {
435435
}
436436

437437
log.Printf("Getting list of deployments matching %s", deploymentName)
438-
_, err := depInterface.Deployments(namespace).Get(deploymentName, metav1.GetOptions{})
438+
_, err := depInterface.Deployments(namespace).Get(deploymentName)
439439
var myError error
440440
if err != nil {
441441
// Create deployment if it does not exist
@@ -474,7 +474,7 @@ func (x *KubeDeploy) doDeploy(e agent.Event) error {
474474
for {
475475
for index, service := range data.Services {
476476
deploymentName := genDeploymentName(data.Project.Slug, service.Name)
477-
deployment, err := depInterface.Deployments(namespace).Get(deploymentName, metav1.GetOptions{})
477+
deployment, err := depInterface.Deployments(namespace).Get(deploymentName)
478478
if err != nil {
479479
log.Printf("Error '%s' fetching deployment status for %s", err, deploymentName)
480480
continue

0 commit comments

Comments
 (0)