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.

Sign up for GitHub

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

Jump to bottom

Bug 1678158 - backport oauth2 support to rhcc #1194

Merged
merged 1 commit into from
Mar 20, 2019
Merged

Bug 1678158 - backport oauth2 support to rhcc #1194

merged 1 commit into from
Mar 20, 2019

Conversation

jmrodri
Copy link
Contributor

@jmrodri jmrodri commented Mar 19, 2019

  • fix debug statement
  • add version log string
  • copy the skip_verify_tls setting to the reg config
  • pass client around so we can skip tls on image get

@jmrodri
Bug 1678158 - backport oauth2 support to rhcc
0c4b40a 
* fix debug statement
* add version log string
* copy the skip_verify_tls setting to the reg config
* pass client around so we can skip tls on image get
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 19, 2019
@jmrodri
Copy link
Contributor Author

jmrodri commented Mar 19, 2019

Before the patch

...
[2019-03-19T15:29:32.623Z] [INFO] - Attempting bootstrap...
[2019-03-19T15:29:32.623Z] [INFO] - AnsibleBroker::Bootstrap
[2019-03-19T15:29:32.623Z] [DEBUG] - Dao::BatchGetRaw
[2019-03-19T15:29:32.624Z] [DEBUG] - Successfully loaded [ 0 ] objects from etcd dir [ /spec ]
[2019-03-19T15:29:32.788Z] [DEBUG] - RHCCRegistry::LoadImages
[2019-03-19T15:29:32.788Z] [DEBUG] - Using https://registry.access.stage.redhat.com/v1/search?q=%22%2A-apb%22 to source APB images
[2019-03-19T15:29:32.943Z] [ERROR] - unable to retrieve image names for registry rh - Get https://registry.access.stage.redhat.com/v1/search?q=%22%2A-apb%22: x509: certificate signed by unknown authority
[2019-03-19T15:29:32.943Z] [WARNING] - registry: 0x13f5930 was unable to complete bootstrap - Get https://registry.access.stage.redhat.com/v1/search?q=%22%2A-apb%22: x509: certificate signed by unknown authority
[2019-03-19T15:29:32.943Z] [ERROR] - Failed to bootstrap on startup!
[2019-03-19T15:29:32.943Z] [ERROR] - all registries failed on bootstrap

@jmrodri
Copy link
Contributor Author

jmrodri commented Mar 19, 2019

After the patch

...
[2019-03-19T20:22:49.349Z] [INFO] - == REGISTRY CX == 
[2019-03-19T20:22:49.349Z] [INFO] - Name: rh
[2019-03-19T20:22:49.349Z] [INFO] - Type: rhcc
[2019-03-19T20:22:49.349Z] [INFO] - Url: https://registry.access.stage.redhat.com
[2019-03-19T20:22:49.349Z] [WARNING] - skipping verification of registry TLS certificate per adapter configuration
[2019-03-19T20:22:49.349Z] [DEBUG] - Creating filter for registry: rh
[2019-03-19T20:22:49.349Z] [DEBUG] - whitelist: [.*-apb$]
[2019-03-19T20:22:49.349Z] [DEBUG] - blacklist: []
...
[2019-03-19T20:22:49.805Z] [DEBUG] - GET /v2/ successful without token
[2019-03-19T20:22:49.805Z] [DEBUG] - RHCCRegistry::LoadImages
[2019-03-19T20:22:49.805Z] [DEBUG] - Using https://registry.access.stage.redhat.com/v1/search?q=%22%2A-apb%22 to source APB images
[2019-03-19T20:22:50.312Z] [DEBUG] - Properly unmarshalled image response
[2019-03-19T20:22:50.312Z] [DEBUG] - Filter applied against registry: rh
[2019-03-19T20:22:50.313Z] [DEBUG] - APBs passing white/blacklist filter:
[2019-03-19T20:22:50.313Z] [DEBUG] - -> rhpam-7/rhpam-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> openshift3/mariadb-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> codeready-workspaces-beta/server-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> openshift3/automation-broker-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> openshift3/mediawiki-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> cnv-tech-preview/kubevirt-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> rhv4-tech-preview/ovirt-flexvolume-driver-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> cnv-tech-preview/import-vm-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> openshift3/mysql-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - -> openshift3/postgresql-apb
[2019-03-19T20:22:50.313Z] [DEBUG] - RHCCAdapter::FetchSpecs
...
[2019-03-19T20:22:50.711Z] [DEBUG] - openshift3/mariadb-apb
[2019-03-19T20:22:50.711Z] [DEBUG] - RHCCAdapter::LoadSpec
[2019-03-19T20:22:50.711Z] [DEBUG] - Registry::imageToSpec
[2019-03-19T20:22:50.991Z] [DEBUG] - adapter::imageToSpec -> Got plans [{ID: Name:dev Description:This plan deploys a single MariaDB ...
...
[2019-03-19T20:22:53.293Z] [DEBUG] - Successfully converted Image registry.access.stage.redhat.com/openshift3/postgresql-apb:v3.9.68 into Spec
[2019-03-19T20:22:53.293Z] [INFO] - Validating specs...
[2019-03-19T20:22:53.293Z] [NOTICE] - All specs passed validation!
[2019-03-19T20:22:53.344Z] [NOTICE] - Broker successfully bootstrapped on startup
[2019-03-19T20:22:53.344Z] [DEBUG] - RefreshInterval: 10m0s
[2019-03-19T20:22:53.344Z] [DEBUG] - calling NewSecureServingOptions
[2019-03-19T20:22:53.458Z] [DEBUG] - Creating k8s apiserver
[2019-03-19T20:22:53.459Z] [DEBUG] - Unable to get broker.cluster_url from config
[2019-03-19T20:22:53.46Z] [NOTICE] - Listening on https://[::]:1338
[2019-03-19T20:22:53.46Z] [NOTICE] - Ansible Service Broker Starting

@jmrodri jmrodri requested review from shawn-hurley and removed request for jwmatthews and eriknelson March 19, 2019 20:34
@coveralls
Copy link

Coverage Status

Coverage increased (+0.2%) to 31.47% when pulling 0c4b40a on 3.9-skip-verify-tls into 6a05b72 on release-1.1.

shawn-hurley
shawn-hurley reviewed Mar 20, 2019
View reviewed changes
pkg/registries/adapters/adapter.go
}

// Retrieve the spec from a registry manifest request
func imageToSpecWithClient(client *http.Client, log *logging.Logger, req *http.Request, image string) (*apb.Spec, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@shawn-hurley
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmrodri, shawn-hurley

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 [jmrodri,shawn-hurley]

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

@openshift-merge-robot openshift-merge-robot merged commit 27983bd into release-1.1 Mar 20, 2019
@jmrodri jmrodri deleted the 3.9-skip-verify-tls branch April 11, 2019 02:00
@jmrodri jmrodri restored the 3.9-skip-verify-tls branch April 11, 2019 02:00
@jmrodri jmrodri deleted the 3.9-skip-verify-tls branch December 13, 2019 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shawn-hurley shawn-hurley shawn-hurley left review comments

Assignees

@shawn-hurley shawn-hurley

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jmrodri @coveralls @shawn-hurley @openshift-ci-robot @openshift-merge-robot