diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go index c9a1b55072688..2f8769c912ebf 100644 --- a/pkg/apis/kops/validation/legacy.go +++ b/pkg/apis/kops/validation/legacy.go @@ -469,9 +469,9 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error { } } - if kubernetesRelease.LT(semver.MustParse("1.6.0")) { + if kubernetesRelease.LT(semver.MustParse("1.7.0")) { if c.Spec.Networking != nil && c.Spec.Networking.Romana != nil { - return field.Invalid(fieldSpec.Child("Networking"), "romana", "romana networking is not supported with kubernetes versions 1.5 or lower") + return field.Invalid(fieldSpec.Child("Networking"), "romana", "romana networking is not supported with kubernetes versions 1.6 or lower") } } diff --git a/upup/models/cloudup/resources/addons/networking.romana/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.romana/k8s-1.7.yaml.template similarity index 94% rename from upup/models/cloudup/resources/addons/networking.romana/k8s-1.6.yaml.template rename to upup/models/cloudup/resources/addons/networking.romana/k8s-1.7.yaml.template index 86a6c42b99926..39ab2ea366f47 100644 --- a/upup/models/cloudup/resources/addons/networking.romana/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.romana/k8s-1.7.yaml.template @@ -137,7 +137,7 @@ spec: effect: NoSchedule containers: - name: romana-daemon - image: quay.io/romana/daemon:v2.0-preview.2 + image: quay.io/romana/daemon:v2.0.0 imagePullPolicy: Always resources: requests: @@ -170,7 +170,7 @@ spec: effect: NoSchedule containers: - name: romana-listener - image: quay.io/romana/listener:v2.0-preview.2 + image: quay.io/romana/listener:v2.0.0 imagePullPolicy: Always resources: requests: @@ -185,6 +185,8 @@ metadata: name: romana-agent namespace: kube-system spec: + updateStrategy: + type: RollingUpdate template: metadata: labels: @@ -200,7 +202,7 @@ spec: effect: NoSchedule containers: - name: romana-agent - image: quay.io/romana/agent:v2.0-preview.2 + image: quay.io/romana/agent:v2.0.0 imagePullPolicy: Always resources: requests: @@ -213,6 +215,10 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: NODEIP + valueFrom: + fieldRef: + fieldPath: status.hostIP args: - --service-cluster-ip-range={{ .ServiceClusterIPRange }} securityContext: @@ -299,7 +305,7 @@ spec: effect: NoSchedule containers: - name: romana-aws - image: quay.io/romana/aws:v2.0-preview.2 + image: quay.io/romana/aws:v2.0.0 imagePullPolicy: Always resources: requests: @@ -328,7 +334,7 @@ spec: effect: NoSchedule containers: - name: romana-vpcrouter - image: quay.io/romana/vpcrouter-romana-plugin + image: quay.io/romana/vpcrouter-romana-plugin:1.1.12 imagePullPolicy: Always resources: requests: diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go index 2255c2162efb9..f14e203a346a9 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go @@ -598,18 +598,18 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri if b.cluster.Spec.Networking.Romana != nil { key := "networking.romana" - version := "v2.0-preview.3" + version := "v2.0.0" { - location := key + "/k8s-1.6.yaml" - id := "k8s-1.6" + location := key + "/k8s-1.7.yaml" + id := "k8s-1.7" addons.Spec.Addons = append(addons.Spec.Addons, &channelsapi.AddonSpec{ Name: fi.String(key), Version: fi.String(version), Selector: networkingSelector, Manifest: fi.String(location), - KubernetesVersion: ">=1.6.0", + KubernetesVersion: ">=1.7.0", Id: id, }) manifests[key+"-"+id] = "addons/" + location