Skip to content

Commit

Permalink
Merge pull request kubevirt#1926 from mfranczy/go-1.11.2
Browse files Browse the repository at this point in the history
Update golang to 1.11.2 version
  • Loading branch information
davidvossel authored Jan 17, 2019
2 parents 304ee14 + 22d7b00 commit 8dec75f
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion hack/docker-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN dnf install -y dnf-plugins-core && \
dnf -y install libvirt-devel-${LIBVIRT_VERSION} make git mercurial sudo gcc findutils gradle rsync-daemon rsync qemu-img protobuf-compiler && \
dnf -y clean all

ENV GIMME_GO_VERSION=1.10
ENV GIMME_GO_VERSION=1.11.2

RUN mkdir -p /gimme && curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | HOME=/gimme bash >> /etc/profile.d/gimme.sh

Expand Down
10 changes: 5 additions & 5 deletions pkg/api/v1/schema_swagger_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/api/v1/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,10 @@ var _ = Describe("Schema", func() {
UUID: "28a42a60-44ef-4428-9c10-1a6aee94627f",
}
exampleVMI.Spec.Domain.CPU = &CPU{
Cores: 3,
Sockets: 1,
Threads: 1,
Model: "Conroe",
Cores: 3,
Sockets: 1,
Threads: 1,
Model: "Conroe",
DedicatedCPUPlacement: true,
}
exampleVMI.Spec.Networks = []Network{
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/types_swagger_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/controller/expectations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func newReplicationController(replicas int) *v1.ReplicationController {
Spec: v1.PodSpec{
Containers: []v1.Container{
{
Image: "foo/bar",
Image: "foo/bar",
TerminationMessagePath: v1.TerminationMessagePathDefault,
ImagePullPolicy: v1.PullIfNotPresent,
SecurityContext: ValidSecurityContextWithContainerDefaults(),
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/openapi/openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ type Validator struct {

func CreateOpenAPIConfig(webServices []*restful.WebService) restfulspec.Config {
return restfulspec.Config{
WebServices: webServices,
WebServicesURL: "",
APIPath: "/swaggerapi",
WebServices: webServices,
WebServicesURL: "",
APIPath: "/swaggerapi",
PostBuildSwaggerObjectHandler: addInfoToSwaggerObject,
}
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-controller/services/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ var _ = Describe("Template", func() {
NodeSelector: nodeSelector,
Domain: v1.DomainSpec{
CPU: &v1.CPU{
Cores: 2,
Cores: 2,
DedicatedCPUPlacement: true,
},
},
Expand Down Expand Up @@ -913,10 +913,10 @@ var _ = Describe("Template", func() {
domain := v1.DomainSpec{}
domain.Devices.Interfaces = []v1.Interface{
{Name: "testnet",
Ports: ports1,
Ports: ports1,
InterfaceBindingMethod: v1.InterfaceBindingMethod{Slirp: &slirpInterface1}},
{Name: "testnet",
Ports: ports2,
Ports: ports2,
InterfaceBindingMethod: v1.InterfaceBindingMethod{Slirp: &slirpInterface2}}}

vmi := v1.VirtualMachineInstance{
Expand Down
12 changes: 6 additions & 6 deletions pkg/virt-operator/creation/rbac/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ func newAdminClusterRole() *rbacv1.ClusterRole {
ObjectMeta: metav1.ObjectMeta{
Name: "kubevirt.io:admin",
Labels: map[string]string{
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
"rbac.authorization.k8s.io/aggregate-to-admin": "true",
},
},
Expand Down Expand Up @@ -247,8 +247,8 @@ func newEditClusterRole() *rbacv1.ClusterRole {
ObjectMeta: metav1.ObjectMeta{
Name: "kubevirt.io:edit",
Labels: map[string]string{
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
"rbac.authorization.k8s.io/aggregate-to-edit": "true",
},
},
Expand Down Expand Up @@ -303,8 +303,8 @@ func newViewClusterRole() *rbacv1.ClusterRole {
ObjectMeta: metav1.ObjectMeta{
Name: "kubevirt.io:view",
Labels: map[string]string{
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
virtv1.AppLabel: "",
virtv1.ManagedByLabel: virtv1.ManagedByLabelOperatorValue,
"rbac.authorization.k8s.io/aggregate-to-view": "true",
},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/vmi_configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ var _ = Describe("Configurations", func() {
It("should be scheduled on a node with running cpu manager", func() {
cpuVmi := tests.NewRandomVMIWithEphemeralDiskAndUserdata(tests.ContainerDiskFor(tests.ContainerDiskCirros), "#!/bin/bash\necho 'hello'\n")
cpuVmi.Spec.Domain.CPU = &v1.CPU{
Cores: 2,
Cores: 2,
DedicatedCPUPlacement: true,
}
cpuVmi.Spec.Domain.Resources = v1.ResourceRequirements{
Expand Down Expand Up @@ -1020,7 +1020,7 @@ var _ = Describe("Configurations", func() {
It("should fail the vmi creation if the requested resources are inconsistent", func() {
cpuVmi := tests.NewRandomVMIWithEphemeralDiskAndUserdata(tests.ContainerDiskFor(tests.ContainerDiskCirros), "#!/bin/bash\necho 'hello'\n")
cpuVmi.Spec.Domain.CPU = &v1.CPU{
Cores: 2,
Cores: 2,
DedicatedCPUPlacement: true,
}
cpuVmi.Spec.Domain.Resources = v1.ResourceRequirements{
Expand Down

0 comments on commit 8dec75f

Please sign in to comment.