Get ingress domain from ingress config #71

Miciah · 2018-11-22T04:49:51Z

Import openshift/api/config/v1

Get ingress domain from ingress config

manifests/00-cluster-role.yaml: Allow operator to get ingresses.config.openshift.io.
pkg/manifests/manifests.go (DefaultClusterIngress): Delete parameter for install config; add parameter for ingress domain.
pkg/manifests/manifests_test.go (TestDefaultClusterIngres): Adjust.
pkg/stub/handler.go (EnsureDefaultClusterIngress): Get the cluster ingress config and use the domain therefrom to set the domain of the default clusteringress.
(ensureDNSForLoadBalancer): Don't add an "apps." prefix to the ingress domain; the default cluster ingress config domain already has it.
pkg/util/config.go (InstallConfig): Delete Metadata field.
(InstallConfigMetadata): Delete.

Depends on openshift/api#139 and openshift/installer#717.

Related: openshift/cluster-openshift-apiserver-operator#51.

Miciah · 2018-11-26T21:32:28Z

Rebased. Added a field DefaultIngressDomain to the new operator.Config object. Changed createHandler to initialize this field, and changed the factory to use it.

Miciah · 2018-11-26T22:57:48Z

Latest push updates openshift/api to include openshift/api#139.

ironcladlou · 2018-11-27T18:47:28Z

/retest

ironcladlou · 2018-11-27T19:02:04Z

/retest

ironcladlou · 2018-11-27T21:15:28Z

/retest

Miciah · 2018-11-28T00:34:13Z

Note: openshift/installer#744 is needed for this to work out of the box.

I tested this PR manually on a cluster that I installed with the changes that are in openshift/installer#744:

% oc -n openshift-ingress-operator delete clusteringresses/default
clusteringress.ingress.openshift.io "default" deleted
% oc -n openshift-ingress-operator scale deployment.apps ingress-operator --replicas=0
deployment.apps/ingress-operator scaled
% oc -n openshift-ingress-operator patch deployment.apps/ingress-operator --type=json --patch='[{"op":"replace","path":"/spec/template/spec/containers/0/image","value":"docker.io/miciah/origin-cluster-ingress-operator:08dc6a5"},{"op":"replace","path":"/spec/template/spec/containers/0/imagePullPolicy","value":"Always"}]'
deployment.apps/ingress-operator patched
% oc -n openshift-ingress-operator scale deployment.apps ingress-operator --replicas=1
deployment.apps/ingress-operator scaled
% oc -n openshift-ingress-operator get clusteringresses/default -o go-template --template=$'{{.spec.ingressDomain}}\n'
apps.mmasters.devcluster.openshift.com
% host foo.apps.mmasters.devcluster.openshift.com
foo.apps.mmasters.devcluster.openshift.com has address 184.169.194.188
foo.apps.mmasters.devcluster.openshift.com has address 52.8.201.142
% oc -n openshift-ingress get services
NAME             TYPE           CLUSTER-IP     EXTERNAL-IP                                                             PORT(S)                      AGE
router-default   LoadBalancer   10.3.178.110   a61f683a9f2a311e8977a068bf0f37b0-85491451.us-west-1.elb.amazonaws.com   80:30481/TCP,443:31043/TCP   10m
% host a61f683a9f2a311e8977a068bf0f37b0-85491451.us-west-1.elb.amazonaws.com
a61f683a9f2a311e8977a068bf0f37b0-85491451.us-west-1.elb.amazonaws.com has address 184.169.194.188
a61f683a9f2a311e8977a068bf0f37b0-85491451.us-west-1.elb.amazonaws.com has address 52.8.201.142

ironcladlou · 2018-11-28T14:36:10Z

/retest

ironcladlou · 2018-11-28T14:48:47Z

/lgtm

openshift-bot · 2018-11-28T17:31:55Z

/retest

Please review the full test history for this PR and help us cut down flakes.

Miciah · 2018-11-28T19:22:30Z

/hold
We'll try to get openshift/installer#754 merged first.

* cmd/cluster-ingress-operator/main.go (createHandler): Get the cluster ingress config and use the domain therefrom to set the operator config object's DefaultIngressDomain field for the ingress domain of the default clusteringress. * manifests/00-cluster-role.yaml: Allow operator to get ingresses.config.openshift.io. * pkg/manifests/manifests.go (DefaultClusterIngress): Delete parameter for install config. Use the operator config object's DefaultClusterIngress field to get the ingress domain. * pkg/manifests/manifests_test.go (TestDefaultClusterIngress): Specify DefaultIngressDomain in operator config object. Delete argument for install config in call to DefaultClusterIngress. * pkg/operator/config.go (Config): Add DefaultIngressDomain field. * pkg/stub/handler.go (EnsureDefaultClusterIngress): Delete argument for install config in call to DefaultClusterIngress. (ensureDNSForLoadBalancer): Don't add an "apps." prefix to the ingress domain; the default cluster ingress config domain already has it. * pkg/util/config.go (InstallConfig): Delete Metadata field. (InstallConfigMetadata): Delete.

Miciah · 2018-11-28T19:24:39Z

Amended in anticipation of openshift/installer#754. Once that PR merges, I'll test the changes in this PR again, then cancel the hold.

Miciah · 2018-11-28T23:41:50Z

Tested as follows.

Delete the old default clusteringress:

% oc -n openshift-ingress-operator delete clusteringresses/default
clusteringress.ingress.openshift.io "default" deleted

Scale down the old operator:

% oc -n openshift-ingress-operator scale deployment.apps ingress-operator --replicas=0
deployment.apps/ingress-operator scaled

Patch in an image with the most recent changes in this PR:

% oc -n openshift-ingress-operator patch deployment.apps/ingress-operator --type=json --patch='[{"op":"replace","path":"/spec/template/spec/containers/0/image","value":"docker.io/miciah/origin-cluster-ingress-operator:6cc7d30"},"op":"replace","path":"/spec/template/spec/containers/0/imagePullPolicy","value":"Always"}]'
deployment.apps/ingress-operator patched

Give the operator permission to read ingresses.config.openshift.io:

% oc apply -f ~/src/github.com/openshift/cluster-ingress-operator/manifests/00-cluster-role.yaml
Warning: oc apply should be used on resource created by either oc create --save-config or oc apply
clusterrole.rbac.authorization.k8s.io/openshift-ingress-operator configured

Verify we have the ingress under the new name, not the old:

% oc get ingresses.config.openshift.io                                                                                                                                                          NAME      AGE
cluster   4h

Scale up the new operator:

% oc -n openshift-ingress-operator scale deployment.apps ingress-operator --replicas=1
deployment.apps/ingress-operator scaled

Check the new default clusteringress:

% oc -n openshift-ingress-operator get clusteringresses/default -o $'jsonpath={.spec.ingressDomain}\n'
apps.mmasters.devcluster.openshift.com

Check the corresponding service:

% oc -n openshift-ingress get svc/router-default
NAME             TYPE           CLUSTER-IP    EXTERNAL-IP                                                               PORT(S)                      AGE
router-default   LoadBalancer   10.3.60.244   a32827412f36511e8a413062a456765a-1574451749.us-west-1.elb.amazonaws.com   80:32385/TCP,443:30527/TCP   17s

Verify the wildcard DNS record resolves to the IP addresses of the LB service:

% host foo.apps.mmasters.devcluster.openshift.com 8.8.8.8
Using domain server:
Name: 8.8.8.8
Address: 8.8.8.8#53
Aliases:

foo.apps.mmasters.devcluster.openshift.com has address 52.9.211.221
foo.apps.mmasters.devcluster.openshift.com has address 13.57.69.99
% host a32827412f36511e8a413062a456765a-1574451749.us-west-1.elb.amazonaws.com 8.8.8.8
Using domain server:
Name: 8.8.8.8
Address: 8.8.8.8#53
Aliases:

a32827412f36511e8a413062a456765a-1574451749.us-west-1.elb.amazonaws.com has address 52.9.211.221
a32827412f36511e8a413062a456765a-1574451749.us-west-1.elb.amazonaws.com has address 13.57.69.99

ironcladlou · 2018-11-29T00:58:09Z

/lgtm
/retest

openshift-ci-robot · 2018-11-29T00:58:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ironcladlou, Miciah

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:

~~OWNERS~~ [ironcladlou]

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

ironcladlou · 2018-11-29T01:00:15Z

/hold cancel

Miciah · 2018-11-29T04:24:03Z

/retest

Miciah · 2018-11-29T22:28:49Z

/retest

Miciah · 2018-11-30T00:11:10Z

/retest

Miciah · 2018-11-30T14:18:33Z

/retest

Miciah · 2018-11-30T15:18:16Z

/retest

Miciah · 2018-11-30T16:29:52Z

/retest

Miciah · 2018-11-30T17:18:02Z

/retest

Miciah · 2018-11-30T19:16:25Z

/retest

Only three flakes this last time:

openshift-tests [Feature:DeploymentConfig] deploymentconfigs with multiple image change triggers [Conformance] should run a successful deployment with a trigger used by different containers [Suite:openshift/conformance/parallel/minimal] [Suite:openshift/smoke-4] 6m8s
openshift-tests [Feature:DeploymentConfig] deploymentconfigs with multiple image change triggers [Conformance] should run a successful deployment with multiple triggers [Suite:openshift/conformance/parallel/minimal] [Suite:openshift/smoke-4] 6m11s
operator Instantiate the template e2e-aws into the operator namespace and wait for any pods to complete 52m25s

ironcladlou · 2018-11-30T19:22:30Z

/retest

Miciah · 2018-11-30T21:36:52Z

/retest

Miciah · 2018-11-30T23:00:58Z

/retest

Miciah · 2018-11-30T23:15:04Z

/retest
Just one flake this time:

operator Instantiate the template e2e-aws into the operator namespace and wait for any pods to complete 8m15s

Miciah · 2018-12-01T05:16:24Z

/retest

openshift-ci-robot requested review from ironcladlou and ramr November 22, 2018 04:49

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 22, 2018

Miciah force-pushed the get-ingress-domain-from-ingress-config branch 2 times, most recently from 4385819 to 7e2c434 Compare November 26, 2018 20:17

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 26, 2018

Miciah force-pushed the get-ingress-domain-from-ingress-config branch from 7e2c434 to f82e871 Compare November 26, 2018 21:30

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 26, 2018

Import openshift/api/config/v1

51ae15e

Miciah force-pushed the get-ingress-domain-from-ingress-config branch from f82e871 to 08dc6a5 Compare November 26, 2018 22:57

openshift-ci-robot assigned ironcladlou Nov 28, 2018

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 28, 2018

Miciah mentioned this pull request Nov 28, 2018

Improve docs #73

Merged

ironcladlou mentioned this pull request Nov 28, 2018

pkg/asset: Rename ingress config openshift/installer#754

Merged

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2018

Miciah force-pushed the get-ingress-domain-from-ingress-config branch from 08dc6a5 to 6cc7d30 Compare November 28, 2018 19:23

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2018

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2018

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 29, 2018

openshift-merge-robot merged commit a1edba1 into openshift:master Dec 1, 2018

Miciah mentioned this pull request Dec 18, 2018

Cloud HA strategy should automatically use PROXY support when available. #84

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get ingress domain from ingress config #71

Get ingress domain from ingress config #71

Miciah commented Nov 22, 2018

Miciah commented Nov 26, 2018

Miciah commented Nov 26, 2018

ironcladlou commented Nov 27, 2018

ironcladlou commented Nov 27, 2018

ironcladlou commented Nov 27, 2018

Miciah commented Nov 28, 2018

ironcladlou commented Nov 28, 2018

ironcladlou commented Nov 28, 2018

openshift-bot commented Nov 28, 2018

Miciah commented Nov 28, 2018

Miciah commented Nov 28, 2018

Miciah commented Nov 28, 2018

ironcladlou commented Nov 29, 2018

openshift-ci-robot commented Nov 29, 2018

ironcladlou commented Nov 29, 2018

Miciah commented Nov 29, 2018

Miciah commented Nov 29, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

ironcladlou commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Dec 1, 2018

Get ingress domain from ingress config #71

Get ingress domain from ingress config #71

Conversation

Miciah commented Nov 22, 2018

Import openshift/api/config/v1

Get ingress domain from ingress config

Miciah commented Nov 26, 2018

Miciah commented Nov 26, 2018

ironcladlou commented Nov 27, 2018

ironcladlou commented Nov 27, 2018

ironcladlou commented Nov 27, 2018

Miciah commented Nov 28, 2018

ironcladlou commented Nov 28, 2018

ironcladlou commented Nov 28, 2018

openshift-bot commented Nov 28, 2018

Miciah commented Nov 28, 2018

Miciah commented Nov 28, 2018

Miciah commented Nov 28, 2018

ironcladlou commented Nov 29, 2018

openshift-ci-robot commented Nov 29, 2018

ironcladlou commented Nov 29, 2018

Miciah commented Nov 29, 2018

Miciah commented Nov 29, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

ironcladlou commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Nov 30, 2018

Miciah commented Dec 1, 2018