eriknelson

[vagrant@localhost ~]$ cat /etc/sysconfig/docker
# /etc/sysconfig/docker

# Modify these options if you want to change the way the docker daemon runs
OPTIONS=' --selinux-enabled     --log-driver=journald  --signature-verification=False'
if [ -z "${DOCKER_CERT_PATH}" ]; then
    DOCKER_CERT_PATH=/etc/docker
fi

# Do not add registries in this file anymore. Use /etc/containers/registries.conf

eriknelson

diff --git a/cmd/broker/main.go b/cmd/broker/main.go
index 15895167..0e0af329 100644
--- a/cmd/broker/main.go
+++ b/cmd/broker/main.go
@@ -16,11 +16,103 @@
 
 package main
 
-import "github.com/openshift/ansible-service-broker/pkg/app"
+import (

eriknelson

I1106 21:30:01.223074      64 feature_gate.go:156] feature gates: map[OriginatingIdentity:true]
I1106 21:30:01.223186      64 controller_manager.go:96] Building k8s kubeconfig
I1106 21:30:01.224824      64 controller_manager.go:124] Building service-catalog kubeconfig for url: 
I1106 21:30:01.224834      64 controller_manager.go:131] Using inClusterConfig to talk to service catalog API server -- make sure your API server is registered with the aggregator
I1106 21:30:01.224919      64 controller_manager.go:144] Starting http server and mux
I1106 21:30:01.224930      64 controller_manager.go:173] Creating event broadcaster
I1106 21:30:01.225438      64 healthz.go:74] Installing healthz checkers:"ping", "checkAPIAvailableResources"
I1106 21:30:01.225449      64 controller_manager.go:213] Using namespace kube-service-catalog for leader election lock
I1106 21:30:01.225512      64 leaderelection.go:174] attempting to acquire leader lease...
E1106 21:30:01.340228      64 event.go:260] Could not construct reference t

eriknelson

I1106 20:12:56.922297      38 feature_gate.go:156] feature gates: map[OriginatingIdentity:true]
I1106 20:12:56.922470      38 controller_manager.go:96] Building k8s kubeconfig
I1106 20:12:56.924966      38 controller_manager.go:124] Building service-catalog kubeconfig for url: 
I1106 20:12:56.924987      38 controller_manager.go:131] Using inClusterConfig to talk to service catalog API server -- make sure your API server is registered with the aggregator
I1106 20:12:56.925594      38 controller_manager.go:144] Starting http server and mux
I1106 20:12:56.925642      38 controller_manager.go:173] Creating event broadcaster
I1106 20:12:56.925746      38 healthz.go:74] Installing healthz checkers:"ping", "checkAPIAvailableResources"
I1106 20:12:56.925826      38 controller_manager.go:213] Using namespace kube-service-catalog for leader election lock
I1106 20:12:56.925853      38 leaderelection.go:174] attempting to acquire leader lease...
E1106 20:12:56.956947      38 event.go:260] Could not construct reference t

eriknelson

I1019 15:41:11.145069      62 feature_gate.go:156] feature gates: map[OriginatingIdentity:true]
I1019 15:41:11.145200      62 flags.go:52] FLAG: --address="0.0.0.0"
I1019 15:41:11.145212      62 flags.go:52] FLAG: --alsologtostderr="false"
I1019 15:41:11.145217      62 flags.go:52] FLAG: --api-content-type="application/json"
I1019 15:41:11.145222      62 flags.go:52] FLAG: --broker-relist-interval="5m0s"
I1019 15:41:11.145227      62 flags.go:52] FLAG: --contention-profiling="false"
I1019 15:41:11.145232      62 flags.go:52] FLAG: --enable-osb-api-context-profile="true"
I1019 15:41:11.145235      62 flags.go:52] FLAG: --feature-gates="OriginatingIdentity=true"
I1019 15:41:11.145244      62 flags.go:52] FLAG: --k8s-api-server-url=""
I1019 15:41:11.145250      62 flags.go:52] FLAG: --k8s-kubeconfig=""

eriknelson

[2017-10-18T20:32:20.868Z] [INFO] Request: "PATCH /ansible-service-broker/v2/service_instances/08331836-fe2e-44c5-9618-7d79b3f0115d?accepts_incomplete=true HTTP/1.1\r\nHost: asb.ansible-service-broker.svc:1338\r\n
Accept-Encoding: gzip\r\nContent-Length: 2\r\nContent-Type: application/json\r\nUser-Agent: Go-http-client/1.1\r\nX-Broker-Api-Originating-Identity: kubernetes eyJncm91cHMiOlsic3lzdGVtOmF1dGhlbnRpY2F0ZWQ6b2F1dGgiL
CJzeXN0ZW06YXV0aGVudGljYXRlZCJdLCJzY29wZXMuYXV0aG9yaXphdGlvbi5vcGVuc2hpZnQuaW8iOlsidXNlcjpmdWxsIl0sInVpZCI6IiIsInVzZXJuYW1lIjoiYWRtaW4ifQ==\r\nX-Broker-Api-Version: 2.12\r\n\r\n{}"

eriknelson

diff --git a/pkg/broker/broker.go b/pkg/broker/broker.go
index 4064d314..eeb8f4d8 100644
--- a/pkg/broker/broker.go
+++ b/pkg/broker/broker.go
@@ -277,6 +277,7 @@ func (a AnsibleBroker) Bootstrap() (*BootstrapResponse, error) {
 		for _, p := range s.Plans {
 			if p.ID == "" {
 				a.log.Errorf("We have a plan that did not get its id generated: %v", p.Name)
+				continue
 			}

eriknelson

diff --git a/pkg/apb/secrets.go b/pkg/apb/secrets.go
index 8b856e9c..d4f2a627 100644
--- a/pkg/apb/secrets.go
+++ b/pkg/apb/secrets.go
@@ -103,11 +103,11 @@ func InitializeSecretsCache(config []SecretsConfig, log *logging.Logger) {
 
 // FilterSecrets - Filters all parameters masked by a secret out of the given
 // specs
-func FilterSecrets(inSpecs []*Spec) ([]*Spec, error) {
+func FilterSecrets(inSpecs []*Spec, config ClusterConfig) ([]*Spec, error) {

eriknelson

agg := make(chan string)
for _, ch := range chans {
  go func(c chan string) {
    for msg := range c {
      agg <- msg
    }
  }(ch)
}

select {

eriknelson

{
  "kind": "APIResourceList",
  "apiVersion": "v1",
  "groupVersion": "servicecatalog.k8s.io/v1alpha1",
  "resources": [
    {
      "name": "servicebrokers",
      "singularName": "",
      "namespaced": false,
      "kind": "ServiceBroker",