Bug 1491430

Summary: prometheus annotations dropped from router service
Product: OKD Reporter: Phil Cameron <pcameron>
Component: NetworkingAssignee: Phil Cameron <pcameron>
Status: CLOSED CURRENTRELEASE QA Contact: Meng Bo <bmeng>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: 3.xCC: aos-bugs, bbennett, somya.rock, xtian, zzhao
Target Milestone: ---   
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2018-03-20 21:07:56 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:

Description Phil Cameron 2017-09-13 19:17:55 UTC
Description of problem:
oc adm router 
creates the router service without the prometheus annotations when the default cert is not supplied. This is a regression introduced by PR 10345 (fix for bug 1349144)


Version-Release number of selected component (if applicable):


How reproducible:
Always.

Steps to Reproduce:
1.oc adm router my-router
2.
3.

Actual results:
my-router service does not have the prometheus annotations.

Expected results:


Additional info:

Comment 1 Phil Cameron 2017-09-13 19:25:15 UTC
Fix in:
https://github.com/openshift/origin/pull/16334

Comment 2 Phil Cameron 2017-09-18 11:46:02 UTC
Merged

Comment 4 Meng Bo 2017-09-28 02:19:09 UTC
Tested on OCP build v3.7.0-0.127.0
The annotations appear in the router svc.

# oc get svc router -o yaml
apiVersion: v1
kind: Service
metadata:
  annotations:
    prometheus.io/port: "1936"
    prometheus.io/scrape: "true"
    prometheus.openshift.io/password: iVPXUF3LkO
    prometheus.openshift.io/username: admin
    service.alpha.openshift.io/serving-cert-generation-error: secret/router-certs
      references serviceUID e209896f-9935-11e7-92d9-525400dd3698, which does not match
      ed3cb12f-a3f1-11e7-8def-525400dd3698
    service.alpha.openshift.io/serving-cert-generation-error-num: "10"
    service.alpha.openshift.io/serving-cert-secret-name: router-certs
  creationTimestamp: 2017-09-28T02:08:32Z
  labels: