Skip to content

Commit b0c9fbf

Browse files
Dave Syerdsyer
authored andcommitted
Make k8s resource checks in http gateway optional
You only need to be paranoid about topic existence if you are running in an actual cluster. Running locally (like it says you can do in the docs) there is no need to check for topic existence in k8s because there is no k8s.
1 parent cc699e4 commit b0c9fbf

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

http-gateway/cmd/http-gateway.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ func main() {
5656
defer consumer.Close()
5757

5858
restConf, err := rest.InClusterConfig()
59-
if err != nil {
60-
panic(err)
61-
}
62-
63-
riffClient, err := versioned.NewForConfig(restConf)
64-
if err != nil {
65-
panic(err)
59+
var riffClient *versioned.Clientset
60+
if err == nil {
61+
riffClient, err = versioned.NewForConfig(restConf)
62+
if err != nil {
63+
panic(err)
64+
}
65+
} else {
66+
riffClient = nil
6667
}
67-
6868
riffTopicExistenceChecker := server.NewRiffTopicExistenceChecker(riffClient)
6969

7070
gw := server.New(8080, producer, consumer, 60*time.Second, riffTopicExistenceChecker)

http-gateway/pkg/server/riff_topic_existence_checker.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,19 @@ func NewRiffTopicExistenceChecker(clientSet *versioned.Clientset) *riffTopicExis
3434
// If there is an unexpected error, it returns (false, err), where 'err' is the unexpected
3535
// error that was encountered.
3636
func (tec *riffTopicExistenceChecker) TopicExists(namespace string, topicName string) (bool, error) {
37-
_, err := tec.client.ProjectriffV1alpha1().Topics(namespace).Get(topicName, v1.GetOptions{})
3837

39-
if err != nil {
40-
if k8serrors.IsNotFound(err) {
41-
return false, nil
38+
if tec.client != nil {
39+
40+
_, err := tec.client.ProjectriffV1alpha1().Topics(namespace).Get(topicName, v1.GetOptions{})
41+
42+
if err != nil {
43+
if k8serrors.IsNotFound(err) {
44+
return false, nil
45+
}
46+
47+
return false, err
4248
}
4349

44-
return false, err
4550
}
4651

4752
return true, nil

0 commit comments

Comments
 (0)