Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

asset/manifests/infrastructure.go: Set the network resource group for the Azure cluster #2541

Merged
merged 4 commits into from Oct 22, 2019

Conversation

abhinavdahiya
Copy link
Contributor

The network resource group is the same as the cluster resource group, unless the Vnet and subnets were provided by the user to the installer.

The new field was added by openshift/api#463

Keeping the network resource group empty is same setting it to cluster resource group, but i think setting it explicitly is more accurate and visible.

/assign @jhixson74

The k8s libs need to be updated because the openshift/api now uses 1.16.0 version.

Without this the build fails with error:

```
vendor/github.com/openshift/api/route/v1/generated.pb.go:448:28: m.ObjectMeta.MarshalToSizedBuffer undefined (type "github.com/openshift/installer/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".ObjectMeta has no field or method MarshalToSizedBuffer)
vendor/github.com/openshift/api/route/v1/generated.pb.go:539:37: m.LastTransitionTime.MarshalToSizedBuffer undefined (type *"github.com/openshift/installer/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".Time has no field or method MarshalToSizedBuffer)
vendor/github.com/openshift/api/route/v1/generated.pb.go:607:26: m.ListMeta.MarshalToSizedBuffer undefined (type "github.com/openshift/installer/vendor/k8s.io/apimachinery/pkg/apis/meta/v1".ListMeta has no field or method MarshalToSizedBuffer)
vendor/github.com/openshift/api/route/v1/generated.pb.go:640:28: m.TargetPort.MarshalToSizedBuffer undefined (type intstr.IntOrString has no field or method MarshalToSizedBuffer)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.go:132:45: scheme.Codecs.WithoutConversion undefined (type serializer.CodecFactory has no field or method WithoutConversion)
```
@abhinavdahiya
Copy link
Contributor Author

/test e2e-azure

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 21, 2019
@abhinavdahiya
Copy link
Contributor Author

/test e2e-azure

@abhinavdahiya
Copy link
Contributor Author

With this change, the byo-vnet settings originally from #2441 (comment) no longer require the additional step of adding machine-api-operator permissions on the network resource group.

INFO Consuming Install Config from target directory
INFO Creating infrastructure resources...
INFO Waiting up to 30m0s for the Kubernetes API at https://api.adahiya-4.installer-azure.devcluster.openshift.com:6443...
INFO API v1.16.0-beta.2+d6da963 up
INFO Waiting up to 30m0s for bootstrapping to complete...
INFO Destroying the bootstrap resources...
INFO Waiting up to 30m0s for the cluster at https://api.adahiya-4.installer-azure.devcluster.openshift.com:6443 to initialize...
INFO Waiting up to 10m0s for the openshift-console route to be created...
INFO Install complete!
INFO To access the cluster as the system:admin user when using 'oc', run 'export KUBECONFIG=/home/adahiya/go/src/github.com/openshift/installer/dev/auth/kubeconfig'
INFO Access the OpenShift web-console here: https://console-openshift-console.apps.adahiya-4.installer-azure.devcluster.openshift.com
INFO Login to the console with user: kubeadmin, password: 5char-5char-5char-5char

@jhixson74
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2019
@abhinavdahiya
Copy link
Contributor Author

/retest

@abhinavdahiya
Copy link
Contributor Author

/test e2e-gcp

The bump was done using
```
$ dep version
dep:
 version     : v0.5.0
 build date  : 2018-07-26
 git hash    : 224a564
 go version  : go1.10.3
 go compiler : gc
 platform    : linux/amd64
 features    : ImportDuringSolve=false

$ dep ensure -update -v github.com/openshift/api github.com/openshift/client-go
```
29bba80 [1] switched off the glog output to highest and had the flag trick to prevent glog flags from showing up.

With switch to kubernetes-1.16.0, all the k8s libs are using klog [2], that doesn't add the flags and also allows to set the default Ouput writer
for all levels. Setting the klog output to ioutil.Discard keeps the current behavior

[1]: openshift@29bba80
[2]: https://godoc.org/k8s.io/klog
… the Azure cluster

The network resource group is the same as the cluster resource group, unless the Vnet and subnets were provided by the user to the installer.
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 21, 2019
@abhinavdahiya
Copy link
Contributor Author

/test e2e-azure

@abhinavdahiya
Copy link
Contributor Author

/test e2e-gcp

@abhinavdahiya
Copy link
Contributor Author

/retest

@jhixson74
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 22, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, jhixson74

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants