Skip to content

Commit 9776370

Browse files
deads2kbparees
deads2k
authored and
bparees
committed
switch to template-service-broker binary
1 parent b85f660 commit 9776370

File tree

8 files changed

+92
-71
lines changed

8 files changed

+92
-71
lines changed

‎cmd/template-service-broker/tsb.go

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ import (
1313
"github.com/golang/glog"
1414
"github.com/openshift/origin/pkg/cmd/util/serviceability"
1515
tsbcmd "github.com/openshift/origin/pkg/templateservicebroker/cmd/server"
16+
17+
// install all APIs
18+
_ "github.com/openshift/origin/pkg/api/install"
19+
_ "k8s.io/kubernetes/pkg/api/install"
20+
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
21+
_ "k8s.io/kubernetes/pkg/apis/batch/install"
22+
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
1623
)
1724

1825
func main() {

‎hack/build-local-images.py

+7
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,13 @@
146146
"files": {},
147147
"enable_default": False,
148148
},
149+
"template-service-broker": {
150+
"directory": "template-service-broker",
151+
"binaries": {
152+
"template-service-broker": "/usr/bin/template-service-broker"
153+
},
154+
"files": {}
155+
},
149156
}
150157

151158

‎install/templateservicebroker/apiserver-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: template-service-broker-apiserver
55
parameters:
66
- name: IMAGE
7-
value: openshift/origin:latest
7+
value: openshift/origin-template-service-broker:latest
88
- name: NAMESPACE
99
value: openshift-template-service-broker
1010
- name: LOGLEVEL
@@ -40,7 +40,7 @@ objects:
4040
image: ${IMAGE}
4141
imagePullPolicy: IfNotPresent
4242
command:
43-
- "/usr/bin/openshift"
43+
- "/usr/bin/template-service-broker"
4444
- "start"
4545
- "template-service-broker"
4646
- "--secure-port=8443"

‎pkg/oc/bootstrap/bindata.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/oc/bootstrap/docker/openshift/templateservicebroker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (h *Helper) InstallTemplateServiceBroker(f *clientcmd.Factory, imageFormat
5353
imageTemplate.Latest = false
5454

5555
params := map[string]string{
56-
"IMAGE": imageTemplate.ExpandOrDie(""),
56+
"IMAGE": imageTemplate.ExpandOrDie("template-service-broker"),
5757
"LOGLEVEL": fmt.Sprint(serverLogLevel),
5858
"NAMESPACE": tsbNamespace,
5959
}

‎pkg/oc/bootstrap/docker/up.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {
10981098
}
10991099
// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin
11001100
//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())
1101-
return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s:%s", c.Image, c.ImageVersion), c.ServerLogLevel)
1101+
return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s-${component}:%s", c.Image, c.ImageVersion), c.ServerLogLevel)
11021102
}
11031103

11041104
// RegisterTemplateServiceBroker will register the tsb with the service catalog

‎test/extended/templates/templateservicebroker_bind.go

+70-63
Original file line numberDiff line numberDiff line change
@@ -39,81 +39,88 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker bind test", f
3939
cliUser user.Info
4040
)
4141

42-
g.BeforeEach(func() {
43-
framework.SkipIfProviderIs("gce")
44-
45-
var err error
46-
47-
brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
48-
49-
cliUser = &user.DefaultInfo{Name: cli.Username(), Groups: []string{"system:authenticated"}}
50-
51-
// enable unauthenticated access to the service broker
52-
clusterrolebinding, err = cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Create(&authorizationapi.ClusterRoleBinding{
53-
ObjectMeta: metav1.ObjectMeta{
54-
Name: cli.Namespace() + "templateservicebroker-client",
55-
},
56-
RoleRef: kapi.ObjectReference{
57-
Name: bootstrappolicy.TemplateServiceBrokerClientRoleName,
58-
},
59-
Subjects: []kapi.ObjectReference{
60-
{
61-
Kind: authorizationapi.GroupKind,
62-
Name: bootstrappolicy.UnauthenticatedGroup,
63-
},
64-
},
65-
})
66-
o.Expect(err).NotTo(o.HaveOccurred())
42+
g.Context("", func() {
43+
g.BeforeEach(func() {
44+
framework.SkipIfProviderIs("gce")
6745

68-
err = cli.AsAdmin().Run("new-app").Args(fixture, "-p", "NAMESPACE="+cli.Namespace()).Execute()
69-
o.Expect(err).NotTo(o.HaveOccurred())
46+
var err error
7047

71-
// wait for templateinstance controller to do its thing
72-
err = wait.Poll(time.Second, time.Minute, func() (bool, error) {
73-
templateinstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{})
74-
if err != nil {
75-
return false, err
76-
}
48+
brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
49+
50+
cliUser = &user.DefaultInfo{Name: cli.Username(), Groups: []string{"system:authenticated"}}
51+
52+
// enable unauthenticated access to the service broker
53+
clusterrolebinding, err = cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Create(&authorizationapi.ClusterRoleBinding{
54+
ObjectMeta: metav1.ObjectMeta{
55+
Name: cli.Namespace() + "templateservicebroker-client",
56+
},
57+
RoleRef: kapi.ObjectReference{
58+
Name: bootstrappolicy.TemplateServiceBrokerClientRoleName,
59+
},
60+
Subjects: []kapi.ObjectReference{
61+
{
62+
Kind: authorizationapi.GroupKind,
63+
Name: bootstrappolicy.UnauthenticatedGroup,
64+
},
65+
},
66+
})
67+
o.Expect(err).NotTo(o.HaveOccurred())
7768

78-
for _, c := range templateinstance.Status.Conditions {
79-
if c.Reason == "Failed" && c.Status == kapi.ConditionTrue {
80-
return false, fmt.Errorf("failed condition: %s", c.Message)
69+
err = cli.AsAdmin().Run("new-app").Args(fixture, "-p", "NAMESPACE="+cli.Namespace()).Execute()
70+
o.Expect(err).NotTo(o.HaveOccurred())
71+
72+
// wait for templateinstance controller to do its thing
73+
err = wait.Poll(time.Second, time.Minute, func() (bool, error) {
74+
templateinstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{})
75+
if err != nil {
76+
return false, err
8177
}
82-
if c.Reason == "Created" && c.Status == kapi.ConditionTrue {
83-
return true, nil
78+
79+
for _, c := range templateinstance.Status.Conditions {
80+
if c.Reason == "Failed" && c.Status == kapi.ConditionTrue {
81+
return false, fmt.Errorf("failed condition: %s", c.Message)
82+
}
83+
if c.Reason == "Created" && c.Status == kapi.ConditionTrue {
84+
return true, nil
85+
}
8486
}
85-
}
8687

87-
return false, nil
88+
return false, nil
89+
})
90+
o.Expect(err).NotTo(o.HaveOccurred())
8891
})
89-
o.Expect(err).NotTo(o.HaveOccurred())
90-
})
9192

92-
g.AfterEach(func() {
93-
err := cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Delete(clusterrolebinding.Name, nil)
94-
o.Expect(err).NotTo(o.HaveOccurred())
95-
96-
err = cli.AdminTemplateClient().Template().BrokerTemplateInstances().Delete(instanceID, &metav1.DeleteOptions{})
97-
o.Expect(err).NotTo(o.HaveOccurred())
93+
g.AfterEach(func() {
94+
if g.CurrentGinkgoTestDescription().Failed {
95+
exutil.DumpPodStates(tsbOC)
96+
exutil.DumpPodLogsStartingWith("", tsbOC)
97+
}
9898

99-
err = portForwardCmdClose()
100-
o.Expect(err).NotTo(o.HaveOccurred())
101-
})
99+
err := cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Delete(clusterrolebinding.Name, nil)
100+
o.Expect(err).NotTo(o.HaveOccurred())
102101

103-
g.It("should pass bind tests", func() {
104-
svc, err := cli.KubeClient().Core().Services(cli.Namespace()).Get("service", metav1.GetOptions{})
105-
o.Expect(err).NotTo(o.HaveOccurred())
102+
err = cli.AdminTemplateClient().Template().BrokerTemplateInstances().Delete(instanceID, &metav1.DeleteOptions{})
103+
o.Expect(err).NotTo(o.HaveOccurred())
106104

107-
bind, err := brokercli.Bind(context.Background(), cliUser, instanceID, bindingID, &api.BindRequest{
108-
ServiceID: serviceID,
109-
PlanID: uuid.NewRandom().String(),
105+
err = portForwardCmdClose()
106+
o.Expect(err).NotTo(o.HaveOccurred())
110107
})
111-
o.Expect(err).NotTo(o.HaveOccurred())
112108

113-
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("configmap-username", "configmap-username"))
114-
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("secret-username", "secret-username"))
115-
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("secret-password", "c2VjcmV0LXBhc3N3b3Jk"))
116-
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("service-uri", "http://"+svc.Spec.ClusterIP+":1234"))
117-
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("route-uri", "http://host/path"))
109+
g.It("should pass bind tests", func() {
110+
svc, err := cli.KubeClient().Core().Services(cli.Namespace()).Get("service", metav1.GetOptions{})
111+
o.Expect(err).NotTo(o.HaveOccurred())
112+
113+
bind, err := brokercli.Bind(context.Background(), cliUser, instanceID, bindingID, &api.BindRequest{
114+
ServiceID: serviceID,
115+
PlanID: uuid.NewRandom().String(),
116+
})
117+
o.Expect(err).NotTo(o.HaveOccurred())
118+
119+
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("configmap-username", "configmap-username"))
120+
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("secret-username", "secret-username"))
121+
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("secret-password", "c2VjcmV0LXBhc3N3b3Jk"))
122+
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("service-uri", "http://"+svc.Spec.ClusterIP+":1234"))
123+
o.Expect(bind.Credentials).To(o.HaveKeyWithValue("route-uri", "http://host/path"))
124+
})
118125
})
119126
})

‎test/extended/testdata/bindata.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)