Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Commit

Permalink
refactor: Refactor all services to use resource-service (#8271)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: All Keptn core now depends on resource-service. From this moment on resource-service installation is mandatory.
  • Loading branch information
RealAnna authored Jul 7, 2022
1 parent 48335cf commit 819963c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ spec:
ports:
- containerPort: 80
env:
- name: CONFIGURATION_SERVICE
value: "http://localhost:8081/configuration-service"
- name: RESOURCE_SERVICE
value: "http://localhost:8081/resource-service"
- name: SHIPYARD_CONTROLLER
value: 'http://localhost:8081/controlPlane'
- name: ENVIRONMENT
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/keptn/go-utils v0.17.0
github.com/keptn/go-utils v0.17.1-0.20220706105648-65503489d75a
github.com/kinbiko/jsonassert v1.1.0
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
github.com/keptn/go-utils v0.17.0 h1:AfxqcL1OBIRHbPDmxRzaVhgAf7Wz/wWrwafdw9i1iP0=
github.com/keptn/go-utils v0.17.0/go.mod h1:EPhgzrqJYbHzK8qbWDDKihWeRJKIkVGR7vi+jaAPftw=
github.com/keptn/go-utils v0.17.1-0.20220706105648-65503489d75a h1:bVOFn4Z2Yje28JhIFgtX4/JakmNtLW4UUr1E4BACoVA=
github.com/keptn/go-utils v0.17.1-0.20220706105648-65503489d75a/go.mod h1:EPhgzrqJYbHzK8qbWDDKihWeRJKIkVGR7vi+jaAPftw=
github.com/kinbiko/jsonassert v1.1.0 h1:AakKgkRFsuzE1FNLYrcxTI7ga5YYcbujOUbSf8l+WmU=
github.com/kinbiko/jsonassert v1.1.0/go.mod h1:QRwBwiAsrcJpjw+L+Q4WS8psLxuUY+HylVZS/4j74TM=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func gotEvent(ctx context.Context, event cloudevents.Event) error {
}

keptnHandler, err := keptnv2.NewKeptn(&event, keptncommon.KeptnOpts{
ConfigurationServiceURL: os.Getenv("CONFIGURATION_SERVICE"),
ConfigurationServiceURL: os.Getenv("RESOURCE_SERVICE"),
})
if err != nil {
fmt.Println("Could not initialize keptn handler: " + err.Error())
Expand Down
2 changes: 1 addition & 1 deletion pkg/serviceutils/service_url_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/url"
)

const configservice = "CONFIGURATION_SERVICE"
const configservice = "RESOURCE_SERVICE"
const shipyardController = "SHIPYARD_CONTROLLER"

func GetConfigServiceURL() (*url.URL, error) {
Expand Down

0 comments on commit 819963c

Please sign in to comment.