Skip to content

Accept service-ca.crt file as parameter #960

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 19, 2018
Merged

Accept service-ca.crt file as parameter #960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions cmd/bridge/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ const (
k8sInClusterCA = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
k8sInClusterBearerToken = "/var/run/secrets/kubernetes.io/serviceaccount/token"

// CA bundle for cluster-created certificates in OpenShift
// https://docs.openshift.org/latest/dev_guide/secrets.html#service-serving-certificate-secrets
openshiftInClusterServiceCA = "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"

// Well-known location of Prometheus service for OpenShift. This is only accessible in-cluster.
openshiftPrometheusHost = "prometheus-k8s.openshift-monitoring.svc:9091"

Expand All @@ -50,6 +46,9 @@ func main() {
fBasePath := fs.String("base-path", "/", "")
fConfig := fs.String("config", "", "The YAML config file.")

// See https://github.com/openshift/service-serving-cert-signer
fServiceCAFile := fs.String("service-ca-file", "", "CA bundle for OpenShift services signed with the service signing certificates.")

fTectonicClusterName := fs.String("tectonic-cluster-name", "tectonic", "The Tectonic cluster name.")

fUserAuth := fs.String("user-auth", "disabled", "disabled | oidc | openshift")
Expand Down Expand Up @@ -257,8 +256,8 @@ func main() {
k8sAuthServiceAccountBearerToken = string(bearerToken)

// If running in an OpenShift cluster, set up a proxy to the prometheus-k8s serivce running in the openshift-monitoring namespace.
if _, err := os.Stat(openshiftInClusterServiceCA); err == nil {
serviceCertPEM, err := ioutil.ReadFile(openshiftInClusterServiceCA)
if *fServiceCAFile != "" {
serviceCertPEM, err := ioutil.ReadFile(*fServiceCAFile)
if err != nil {
log.Fatalf("failed to read service-ca.crt file: %v", err)
}
Expand All @@ -277,9 +276,6 @@ func main() {
HeaderBlacklist: []string{"Cookie", "X-CSRFToken"},
Endpoint: &url.URL{Scheme: "https", Host: openshiftAlertManagerHost, Path: "/api"},
}
} else if !os.IsNotExist(err) {
// Ignore errors when the file does not exist, which is the case if not running on OpenShift. Fail on other errors.
log.Fatalf("failed to stat service-ca.crt file: %v", err)
}

case "off-cluster":
Expand Down