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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cloudfoundry/service-fabrik-broker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.23.0
Choose a base ref
...
head repository: cloudfoundry/service-fabrik-broker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 30, 2022

  1. Upgrade alicloud/pop-core from v1.7.9 to v1.7.10

    json-bigint is an indirect dependency coming from alicloud/pop-core.
    upgrading alicloud/pop-core from v1.7.9 to v1.7.10, upgrades json-bigint
    from v0.2.3 to v1.0.0
    pooja-sap13 authored and anoopjb committed Mar 30, 2022
    Copy the full SHA
    d797535 View commit details

Commits on Apr 1, 2022

  1. Handle SFPlan deletion for single cluster (#1598)

    * Handle SFPlan deletion for single cluster
    
    * Force use statcicheck v0.2.2 to avoid travis build failures.
    pooja-sap13 authored Apr 1, 2022
    Copy the full SHA
    65c421b View commit details

Commits on Apr 4, 2022

  1. Copy the full SHA
    388f28b View commit details
  2. cloudfoundry-incubator/dev_pr_252 ( #1601)

    Updating broker/Interoperator docker image versions:0.23.1
    jintusebastian authored Apr 4, 2022
    Copy the full SHA
    ecee017 View commit details
  3. Copy the full SHA
    9cc06a0 View commit details

Commits on Apr 6, 2022

  1. Set in the context to be used by dashboard url. (#1603)

    If the plan contains dashboard url, it may refer to the sfserviceinstance
    for reading the name & cluster id properties. If the instance is not present
    it throws an exception and the GET call fails.
    pooja-sap13 authored Apr 6, 2022
    Copy the full SHA
    47ef48c View commit details

Commits on Apr 7, 2022

  1. Bump momentjs to 2.29.2

    - Mitigate CVE-2022-24785
    - Update yarn.lock
    anoopjb committed Apr 7, 2022
    Copy the full SHA
    286d5a5 View commit details

Commits on May 23, 2022

  1. Broker logging enhancements (#1629)

    - Prevent logging authorization header
    anoopjb authored May 23, 2022
    Copy the full SHA
    f938202 View commit details

Commits on Jun 7, 2022

  1. Adding event filter to reduce provisioner logs. (#1630)

    * Event filter is added for node resource
    
    * Adding uncached client to retreive pods list
    
    * updating constants.go
    jintusebastian authored Jun 7, 2022
    Copy the full SHA
    a2615db View commit details

Commits on Jun 8, 2022

  1. Copy the full SHA
    e84064c View commit details

Commits on Jul 20, 2022

  1. Copy the full SHA
    aca1aaf View commit details

Commits on Sep 14, 2022

  1. Copy the full SHA
    298d8e5 View commit details
  2. Copy the full SHA
    c7a1cf6 View commit details

Commits on Sep 20, 2022

  1. Support nginx ingress annotations

    - Configure ingress annotations through value.yaml
    - Update auth-tls-verify-depth to 2
    anoopjb authored and jintusebastian committed Sep 20, 2022
    Copy the full SHA
    d438c68 View commit details
  2. Set ingress annotations as string

    anoopjb authored and jintusebastian committed Sep 20, 2022
    Copy the full SHA
    3b7fc91 View commit details
  3. update dependencies

    jintusebastian committed Sep 20, 2022
    Copy the full SHA
    5d38769 View commit details
  4. Copy the full SHA
    1e47e92 View commit details

Commits on Sep 21, 2022

  1. Updating broker/Interoperator docker image versions:0.23.3

    i068838 authored and anoopjb committed Sep 21, 2022
    Copy the full SHA
    ff15f7a View commit details

Commits on Oct 6, 2022

  1. Bump github.com/onsi/gomega from 1.17.0 to 1.20.2 in /operator-apis

    Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.17.0 to 1.20.2.
    - [Release notes](https://github.com/onsi/gomega/releases)
    - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
    - [Commits](onsi/gomega@v1.17.0...v1.20.2)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/onsi/gomega
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and anoopjb committed Oct 6, 2022
    Copy the full SHA
    f965675 View commit details

Commits on Oct 25, 2022

  1. Bump k8s.io/apimachinery from 0.25.0 to 0.25.3 in /operator-apis

    Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.25.0 to 0.25.3.
    - [Release notes](https://github.com/kubernetes/apimachinery/releases)
    - [Commits](kubernetes/apimachinery@v0.25.0...v0.25.3)
    
    ---
    updated-dependencies:
    - dependency-name: k8s.io/apimachinery
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and anoopjb committed Oct 25, 2022
    Copy the full SHA
    e0705c1 View commit details
  2. Bump k8s.io/apimachinery from 0.25.0 to 0.25.3 in /interoperator

    Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.25.0 to 0.25.3.
    - [Release notes](https://github.com/kubernetes/apimachinery/releases)
    - [Commits](kubernetes/apimachinery@v0.25.0...v0.25.3)
    
    ---
    updated-dependencies:
    - dependency-name: k8s.io/apimachinery
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and anoopjb committed Oct 25, 2022
    Copy the full SHA
    3ae860b View commit details
  3. Bump Node and Alpine

    - Upgrade Node to 16.18
    - Upgrade Alpine to 3.16
    anoopjb committed Oct 25, 2022
    Copy the full SHA
    ada963b View commit details
  4. Bump alpine version

    - Upgrade alpine to 3.16 in Interoperator and operator-apis Dockerfile
    anoopjb committed Oct 25, 2022
    Copy the full SHA
    3143151 View commit details
  5. Bump k8s.io/api from 0.25.0 to 0.25.3 in /operator-apis

    Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.25.0 to 0.25.3.
    - [Release notes](https://github.com/kubernetes/api/releases)
    - [Commits](kubernetes/api@v0.25.0...v0.25.3)
    
    ---
    updated-dependencies:
    - dependency-name: k8s.io/api
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and anoopjb committed Oct 25, 2022
    Copy the full SHA
    e8932dc View commit details
  6. Updating broker/Interoperator docker image versions:0.23.4

    i068838 authored and anoopjb committed Oct 25, 2022
    Copy the full SHA
    7087e62 View commit details

Commits on Nov 14, 2022

  1. code changed based on V3 and UT's fixed (#1755)

    * code changed based on V3 and UT's fixed
    
    * code updated
    
    * code changes for /v2/spaces and /v2/org
    pawansap authored Nov 14, 2022
    Copy the full SHA
    310fa50 View commit details

Commits on Nov 16, 2022

  1. Use ClusterIP as default

    * ClusterIP as default for Broker
    anoopjb committed Nov 16, 2022
    Copy the full SHA
    6d0e0d6 View commit details

Commits on Jan 3, 2023

  1. Remove unused Lerna library (#1793)

    * remove Lerna from package.json
    * update yarn
    pawansap authored Jan 3, 2023
    Copy the full SHA
    f0da23e View commit details

Commits on Jan 25, 2023

  1. [IOP] Logging parameters are made configurable (#1785)

    Improve log level handling
    
    * Add support for configuring log level in Broker
    * Add support for configuring  Zap log level configurations in Interoperator
    vinaybheri authored Jan 25, 2023
    Copy the full SHA
    e793257 View commit details

Commits on Feb 6, 2023

  1. Bump express-jwt and jsonwebtoken (#1812)

    * express-jwt to 8.3.0
    * jsonwebtoken to 9.0.0
    pawansap authored Feb 6, 2023
    Copy the full SHA
    4e5251f View commit details

Commits on Feb 15, 2023

  1. SFIOP-3523

    jintusebastian committed Feb 15, 2023
    Copy the full SHA
    ed1ce37 View commit details

Commits on Feb 21, 2023

  1. Copy the full SHA
    637593c View commit details

Commits on Feb 24, 2023

  1. Support custom namespace labels (#1823)

    Ticket: SFIOP-3562
    pawansap authored Feb 24, 2023
    Copy the full SHA
    0aa76c8 View commit details

Commits on Feb 27, 2023

  1. Updated RSA to ECDSA type encryption (#1827)

    * changed RSA algorithm from sha1 to sha256
    
    * updated RSA to ECDSA type encryption
    pawansap authored Feb 27, 2023
    Copy the full SHA
    5ca9cce View commit details

Commits on Mar 7, 2023

  1. Support to Upgrade Internal MongoDB to 4.0 from 3.4 (#1843)

    This change will allow upgrade of internal service-fabrik-mongodb to plan with version v4.0 from v3.4 plan.
    jintusebastian authored Mar 7, 2023
    Copy the full SHA
    859aafe View commit details

Commits on Mar 10, 2023

  1. Copy the full SHA
    0ebf6ba View commit details

Commits on Jun 6, 2023

  1. Copy the full SHA
    44b4128 View commit details

Commits on Jun 20, 2023

  1. Copy the full SHA
    e41d3fc View commit details
  2. Copy the full SHA
    3a34d50 View commit details

Commits on Jun 22, 2023

  1. [IOP] Updating doc for new metrics controllers (#1889)

    * This Change updates the document about new metrics added  (interoperator_service_bindings_metrics_state, interoperator_service_instances_metrics_state) by the 2 new controllers (sfserviceinstancemetrics and sfservicebindingmetrics)
    vinaybheri authored Jun 22, 2023
    Copy the full SHA
    1083db3 View commit details

Commits on Jul 4, 2023

  1. [Metering] During plan update send start event after stop event (#1890)

    * During plan update the metering start event was sent before to metering stop event. As a result many instances after plan update got missing from the metering (escaped from charging).
    * To fix this issue we have fixed the code to send stop event first and then start event during plan update also made sure that there is a gap 1 ms between each event.
    vinaybheri authored Jul 4, 2023
    Copy the full SHA
    d81d018 View commit details

Commits on Jul 27, 2023

  1. Copy the full SHA
    14581f4 View commit details

Commits on Aug 8, 2023

  1. Copy the full SHA
    7fe18ba View commit details
  2. Fix logging error in sfservicebindingmetrics (#1899)

    * The log.Info call requires key value pair to log message.
    (Error message: odd number of arguments passed as key-value pairs for logging).
    * Added missing key parameter to log.Info call to fix it.
    vinaybheri authored Aug 8, 2023
    Copy the full SHA
    1c3bbd7 View commit details

Commits on Aug 22, 2023

  1. Copy the full SHA
    3ead45e View commit details
  2. Copy the full SHA
    388930b View commit details

Commits on Sep 5, 2023

  1. Update npm version

    Updating nodejs version to v9.8.1
    Latest version of npm is not compatible with node js version used in Interoperator (node js version used:16.18).
    Latest version of npm: 10.0.0, Supported node version: "node": "^18.17.0 || >=20.5.0"
    jintusebastian committed Sep 5, 2023
    Copy the full SHA
    c55cb6b View commit details

Commits on Sep 6, 2023

  1. bump apimachinery from 0.25.3 to 0.25.13 (#1905)

    Vulnerability updated
    Co-authored-by: I584936 <manav.saraf@sap.com>
    manavsaraf1 authored Sep 6, 2023
    Copy the full SHA
    0253c2d View commit details

Commits on Sep 7, 2023

  1. Copy the full SHA
    fd972c0 View commit details
  2. updated k8s library versions (#1913)

    Bump k8s libraries
    Co-authored-by: I584936 <manav.saraf@sap.com>
    manavsaraf1 authored Sep 7, 2023
    Copy the full SHA
    e5a889f View commit details
Showing with 7,445 additions and 16,933 deletions.
  1. +20 −16 .travis.yml
  2. +17 −14 README.md
  3. +1 −1 broker/Dockerfile
  4. +2 −2 broker/applications/admin/package.json
  5. +11 −4 broker/applications/admin/src/api-controllers/ServiceFabrikAdminController.js
  6. +2 −2 broker/applications/deployment_hooks/package.json
  7. +3 −4 broker/applications/extensions/package.json
  8. +1 −12 broker/applications/extensions/src/api-controllers/DashboardController.js
  9. +1 −1 broker/applications/extensions/src/api-controllers/ServiceFabrikApiController.js
  10. +0 −170 broker/applications/extensions/test/acceptance/dashboard.docker.spec.js
  11. +1 −3 broker/applications/extensions/test/acceptance/service-fabrik-api-2.0.instances.director.spec.js
  12. +0 −16 broker/applications/extensions/test/acceptance/service-fabrik-api.info.spec.js
  13. +2 −4 broker/applications/extensions/test/acceptance/service-fabrik-api.instances.director.spec.js
  14. +2 −3 broker/applications/operators/package.json
  15. +0 −24 broker/applications/operators/src/StartDockerOperators.js
  16. +0 −89 broker/applications/operators/src/docker-operator/DockerBindOperator.js
  17. +0 −46 broker/applications/operators/src/docker-operator/DockerImageLoaderService.js
  18. +0 −117 broker/applications/operators/src/docker-operator/DockerOperator.js
  19. +0 −817 broker/applications/operators/src/docker-operator/DockerService.js
  20. +0 −455 broker/applications/operators/test/operators.DockerManager.spec.js
  21. +0 −475 broker/applications/operators/test/operators.DockerService.spec.js
  22. +2 −2 broker/applications/osb-broker/package.json
  23. +1 −0 broker/applications/osb-broker/src/api-controllers/ServiceBrokerApiController.js
  24. +3 −3 broker/applications/osb-broker/src/api-controllers/middleware/index.js
  25. +3 −3 broker/applications/osb-broker/test/acceptance/service-broker-api-2.0.instances.director.spec.js
  26. +8 −302 broker/applications/osb-broker/test/acceptance/service-broker-api.GetEndpoints.spec.js
  27. +2 −2 broker/applications/osb-broker/test/acceptance/service-broker-api.catalog.spec.js
  28. +1 −1 broker/applications/osb-broker/test/acceptance/service-broker-api.instances.director.spec.js
  29. +0 −822 broker/applications/osb-broker/test/acceptance/service-broker-api.instances.docker.spec.js
  30. +1 −1 broker/applications/quota-app/package.json
  31. +2 −2 broker/applications/reports/package.json
  32. +2 −2 broker/applications/scheduler/package.json
  33. +1 −1 broker/bin/broker
  34. +1 −1 broker/bin/clone-for-development
  35. +1 −1 broker/bin/config
  36. +0 −27 broker/bin/create_and_delete
  37. +0 −4 broker/bin/watch-containers
  38. +0 −61 broker/config/crds/bind.servicefabrik.io_v1alpha1_dockerbinds.yaml
  39. +0 −64 broker/config/crds/deployment.servicefabrik.io_v1alpha1_dockers.yaml
  40. +0 −59 broker/config/samples/templates/gotemplates/docker/bind.yaml
  41. +0 −44 broker/config/samples/templates/gotemplates/docker/provision.yaml
  42. +0 −15 broker/config/samples/templates/gotemplates/docker/sources.yaml
  43. +0 −101 broker/config/samples/templates/gotemplates/docker/status.yaml
  44. +5 −148 broker/config/settings.yml
  45. +11 −50 broker/core/app-config/src/index.js
  46. +4 −4 broker/core/express-commons/package.json
  47. +2 −2 broker/core/logging/package.json
  48. +1 −1 broker/core/logging/src/index.js
  49. +3 −3 broker/core/platform-managers/src/CfPlatformManager.js
  50. +7 −5 broker/core/platform-managers/test/fabrik.CfPlatformManager.spec.js
  51. +1 −3 broker/core/provisioner-services/test/operators.DirectorService.spec.js
  52. +2 −2 broker/core/scheduler-jobs/package.json
  53. +1 −8 broker/core/scheduler-jobs/src/jobs/MeterInstanceJob.js
  54. +0 −37 broker/core/scheduler-jobs/test/jobs.MeteringInstanceJobs.spec.js
  55. +5 −5 broker/core/utils/package.json
  56. +3 −1 broker/core/utils/src/HttpClient.js
  57. +2 −2 broker/core/utils/src/RsaKeyGenerator.js
  58. +2 −10 broker/core/utils/src/commonVariables.js
  59. +0 −7 broker/core/utils/src/errors.js
  60. +0 −12 broker/core/utils/test/errors.spec.js
  61. +7 −7 broker/core/utils/test/utils.spec.js
  62. +2 −2 broker/data-access-layer/bosh/package.json
  63. +1 −1 broker/data-access-layer/cf/package.json
  64. +8 −8 broker/data-access-layer/cf/src/CloudControllerClient.js
  65. +39 −10 broker/data-access-layer/cf/test/cf.CloudControllerClient.spec.js
  66. +1 −1 broker/data-access-layer/db/package.json
  67. +26 −6 broker/data-access-layer/db/src/DBManager.js
  68. +0 −5 broker/data-access-layer/docker/.eslintignore
  69. +0 −112 broker/data-access-layer/docker/.eslintrc.json
  70. +0 −4 broker/data-access-layer/docker/.prettierrc
  71. +0 −20 broker/data-access-layer/docker/package.json
  72. +0 −132 broker/data-access-layer/docker/src/Docker.js
  73. +0 −98 broker/data-access-layer/docker/src/DockerClient.js
  74. +0 −133 broker/data-access-layer/docker/src/DockerCredentials.js
  75. +0 −63 broker/data-access-layer/docker/src/DockerPortRegistry.js
  76. +0 −5 broker/data-access-layer/docker/src/index.js
  77. +0 −376 broker/data-access-layer/docker/test/docker.DockerCredentials.spec.js
  78. +0 −111 broker/data-access-layer/docker/test/docker.DockerPortRegistry.spec.js
  79. +0 −53 broker/data-access-layer/event-logger/test/EventLogInterceptor.spec.js
  80. +5 −1 broker/data-access-layer/eventmesh/.eslintrc.json
  81. +1 −1 broker/data-access-layer/eventmesh/package.json
  82. +4 −3 broker/data-access-layer/eventmesh/src/ApiServerClient.js
  83. +31 −1 broker/data-access-layer/eventmesh/test/eventmesh.ApiServerClient.spec.js
  84. +6 −6 broker/data-access-layer/iaas/package.json
  85. +2 −0 broker/data-access-layer/iaas/src/AliClient.js
  86. +1 −1 broker/data-access-layer/quota/package.json
  87. +1 −1 broker/data-access-layer/quota/src/cf-platform-quota-manager/CFPlatformQuotaManager.js
  88. +3 −7 broker/data-access-layer/quota/test/quota.QuotaManager.spec.js
  89. +3 −4 broker/package.json
  90. +1 −1 broker/test/init
  91. +6 −6 broker/test/test_broker/mocks/apiServerEventMesh.js
  92. +26 −31 broker/test/test_broker/mocks/cloudController.js
  93. +0 −204 broker/test/test_broker/mocks/docker.js
  94. +5 −5 broker/test/test_broker/mocks/index.js
  95. +5 −1 broker/tools/module-generator/files/.eslintrc.json
  96. +2,266 −6,218 broker/yarn.lock
  97. +41 −2 docs/Interoperator-Features.md
  98. +10 −1 docs/Interoperator-metrics.md
  99. +23 −8 docs/Interoperator.md
  100. +5 −5 docs/SF2.0.md
  101. +2 −2 docs/interoperator-upgrades.md
  102. +7 −0 docs/operator_apis.md
  103. +2 −2 helm-charts/interoperator/Chart.yaml
  104. +18 −3 helm-charts/interoperator/conf/settings.yaml
  105. +21 −13 helm-charts/interoperator/crds/sfcluster.yaml
  106. +1 −9 helm-charts/interoperator/crds/sfplan.yaml
  107. +1 −9 helm-charts/interoperator/crds/sfservice.yaml
  108. +1 −9 helm-charts/interoperator/crds/sfservicebinding.yaml
  109. +1 −9 helm-charts/interoperator/crds/sfserviceinstance.yaml
  110. +1 −0 helm-charts/interoperator/templates/broker.yaml
  111. +61 −1 helm-charts/interoperator/templates/multiclusterdeployer.yaml
  112. +4 −0 helm-charts/interoperator/templates/operator_api_app.yaml
  113. +3 −0 helm-charts/interoperator/templates/provisioner.yaml
  114. +14 −0 helm-charts/interoperator/templates/quota_app.yaml
  115. +4 −1 helm-charts/interoperator/templates/scheduler.yaml
  116. +8 −1 helm-charts/interoperator/templates/secret.yaml
  117. +34 −5 helm-charts/interoperator/values.yaml
  118. +17 −3 interoperator/Dockerfile
  119. +169 −61 interoperator/Makefile
  120. +1 −1 interoperator/api/osb/v1alpha1/sfplan_types.go
  121. +50 −0 interoperator/api/osb/v1alpha1/sfservicebinding_types.go
  122. +136 −0 interoperator/api/osb/v1alpha1/sfservicebinding_types_test.go
  123. +53 −0 interoperator/api/osb/v1alpha1/sfserviceinstance_types.go
  124. +137 −0 interoperator/api/osb/v1alpha1/sfserviceinstance_types_test.go
  125. +1 −2 interoperator/api/osb/v1alpha1/zz_generated.deepcopy.go
  126. +1 −0 interoperator/api/resource/v1alpha1/interface.go
  127. +0 −26 interoperator/api/resource/v1alpha1/mock_sfcluster/mock_sfcluster.go
  128. +1 −2 interoperator/api/resource/v1alpha1/zz_generated.deepcopy.go
  129. +1 −9 interoperator/config/crd/bases/osb.servicefabrik.io_sfplans.yaml
  130. +1 −9 interoperator/config/crd/bases/osb.servicefabrik.io_sfservicebindings.yaml
  131. +1 −9 interoperator/config/crd/bases/osb.servicefabrik.io_sfserviceinstances.yaml
  132. +1 −9 interoperator/config/crd/bases/osb.servicefabrik.io_sfservices.yaml
  133. +21 −13 interoperator/config/crd/bases/resource.servicefabrik.io_sfclusters.yaml
  134. +4 −6 interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller.go
  135. +1 −1 interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller_test.go
  136. +4 −7 interoperator/controllers/multiclusterdeploy/offboarding/suite_test.go
  137. +4 −6 interoperator/controllers/multiclusterdeploy/provisioner/provisioner_controller.go
  138. +9 −12 interoperator/controllers/multiclusterdeploy/provisioner/provisioner_controller_test.go
  139. +1 −0 interoperator/controllers/multiclusterdeploy/setup_dummymulticlusterdeploy.go
  140. +27 −9 interoperator/controllers/multiclusterdeploy/setup_multiclusterdeploy.go
  141. +5 −2 interoperator/controllers/multiclusterdeploy/sfclusterreplicator/sfclusterreplicator_controller.go
  142. +4 −7 interoperator/controllers/multiclusterdeploy/sfclusterreplicator/suite_test.go
  143. +58 −58 interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller.go
  144. +134 −134 interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller_test.go
  145. +7 −10 interoperator/controllers/multiclusterdeploy/sfplanoffboarding/suite_test.go
  146. +141 −0 ...ator/controllers/multiclusterdeploy/sfservicebindingmetrics/sfservicebindingmetrics_controller.go
  147. +104 −0 ...llers/multiclusterdeploy/sfservicebindingmetrics/sfservicebindingmetrics_controller_suite_test.go
  148. +190 −0 ...controllers/multiclusterdeploy/sfservicebindingmetrics/sfservicebindingmetrics_controller_test.go
  149. +4 −1 ...ontrollers/multiclusterdeploy/sfservicebindingreplicator/sfservicebindingreplicator_controller.go
  150. +4 −3 ...llers/multiclusterdeploy/sfservicebindingreplicator/sfservicebindingreplicator_controller_test.go
  151. +144 −0 ...or/controllers/multiclusterdeploy/sfserviceinstancemetrics/sfserviceinstancemetrics_controller.go
  152. +104 −0 ...ers/multiclusterdeploy/sfserviceinstancemetrics/sfserviceinstancemetrics_controller_suite_test.go
  153. +179 −0 ...ntrollers/multiclusterdeploy/sfserviceinstancemetrics/sfserviceinstancemetrics_controller_test.go
  154. +81 −42 ...trollers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller.go
  155. +2 −3 ...ers/multiclusterdeploy/sfserviceinstancereplicator/sfserviceinstancereplicator_controller_test.go
  156. +1 −0 interoperator/controllers/multiclusterdeploy/upgrade_hook.go
  157. +10 −10 interoperator/controllers/multiclusterdeploy/watchmanager/internal.go
  158. +6 −5 interoperator/controllers/multiclusterdeploy/watchmanager/internal_test.go
  159. +1 −0 interoperator/controllers/multiclusterdeploy/watchmanager/manager.go
  160. +4 −2 interoperator/controllers/multiclusterdeploy/watchmanager/manager_test.go
  161. +9 −2 interoperator/controllers/multiclusterdeploy/watchmanager/watchmanager_suite_test.go
  162. +1 −0 interoperator/controllers/provisioners/setup_dummyprovisioners.go
  163. +18 −7 interoperator/controllers/provisioners/sfclusterusage/sfclusterusage_controller.go
  164. +4 −7 interoperator/controllers/provisioners/sfclusterusage/suite_test.go
  165. +2 −2 interoperator/controllers/provisioners/sfplan/sfplan_controller.go
  166. +2 −3 interoperator/controllers/provisioners/sfplan/sfplan_controller_test.go
  167. +2 −3 interoperator/controllers/provisioners/sfservice/sfservice_controller_test.go
  168. +4 −6 interoperator/controllers/provisioners/sfservicebinding/sfservicebinding_controller.go
  169. +3 −3 interoperator/controllers/provisioners/sfservicebinding/sfservicebinding_controller_test.go
  170. +2 −1 ...rator/controllers/provisioners/sfservicebindingcleaner/sfservicebindingcleaner_controller_test.go
  171. +4 −6 interoperator/controllers/provisioners/sfserviceinstance/sfserviceinstance_controller.go
  172. +7 −6 interoperator/controllers/provisioners/sfserviceinstance/sfserviceinstance_controller_test.go
  173. +1 −0 interoperator/controllers/schedulers/setup_defaultscheduler.go
  174. +1 −0 interoperator/controllers/schedulers/setup_dummyschedulers.go
  175. +2 −0 interoperator/controllers/schedulers/setup_schedulers.go
  176. +2 −4 interoperator/controllers/schedulers/sfdefaultscheduler/sfdefaultscheduler_controller_test.go
  177. +2 −2 interoperator/controllers/schedulers/sflabelselectorscheduler/sflabelselectorscheduler_controller.go
  178. +2 −1 ...rator/controllers/schedulers/sflabelselectorscheduler/sflabelselectorscheduler_controller_test.go
  179. +6 −2 interoperator/controllers/schedulers/sfserviceinstancecounter/sfserviceinstancecounter_controller.go
  180. +2 −1 ...rator/controllers/schedulers/sfserviceinstancecounter/sfserviceinstancecounter_controller_test.go
  181. +65 −38 interoperator/controllers/schedulers/sfserviceinstanceupdater/sfserviceinstanceupdater_controller.go
  182. +2 −1 ...rator/controllers/schedulers/sfserviceinstanceupdater/sfserviceinstanceupdater_controller_test.go
  183. +111 −0 interoperator/controllers/schedulers/updateinstancecount.go
  184. +93 −91 interoperator/go.mod
  185. +253 −1,460 interoperator/go.sum
  186. +1 −1 interoperator/hack/boilerplate.go.txt
  187. +12 −12 interoperator/internal/dynamic/dynamic.go
  188. +33 −33 interoperator/internal/dynamic/dynamic_test.go
  189. +1 −2 interoperator/internal/renderer/helm/renderer.go
  190. +2 −2 interoperator/internal/renderer/helm/renderer_test.go
  191. +5 −3 interoperator/internal/resources/resources.go
  192. +0 −24 interoperator/internal/resources/resources_test.go
  193. +1 −1 interoperator/internal/services/services.go
  194. +101 −0 interoperator/kubeconfig_rotation/go.mod
  195. +621 −0 interoperator/kubeconfig_rotation/go.sum
  196. +214 −0 interoperator/kubeconfig_rotation/main.go
  197. +14 −4 interoperator/main.go
  198. +7 −7 interoperator/pkg/client/clientset/versioned/fake/register.go
  199. +7 −7 interoperator/pkg/client/clientset/versioned/scheme/register.go
  200. +1 −0 interoperator/pkg/cluster/registry/registry.go
  201. +11 −5 interoperator/pkg/cluster/registry/registry_suite_test.go
  202. +1 −1 interoperator/pkg/constants/constants.go
  203. +1 −0 interoperator/pkg/constants/default.go
  204. +1 −0 interoperator/pkg/constants/multiclusterdeploy.go
  205. +1 −0 interoperator/pkg/constants/provisioners.go
  206. +1 −0 interoperator/pkg/constants/schedulers.go
  207. +1 −1 interoperator/pkg/utils/checksum.go
  208. +58 −0 interoperator/pkg/watches/watches.go
  209. +6 −5 interoperator/scripts/install.sh
  210. +1 −0 interoperator/tools.go
  211. +2 −2 operator-apis/Dockerfile
  212. +49 −44 operator-apis/go.mod
  213. +117 −1,555 operator-apis/go.sum
  214. +2 −0 operator-apis/internal/constants/constants.go
  215. +90 −0 operator-apis/internal/handlers/handlers.go
  216. +7 −1 operator-apis/internal/handlers/handlers_suite_test.go
  217. +1 −0 operator-apis/internal/router/router.go
  218. +4 −0 operator-apis/internal/router/router_test.go
  219. +6 −1 operator-apis/main.go
  220. +0 −896 webhooks/Gopkg.lock
  221. +0 −36 webhooks/Gopkg.toml
  222. +62 −0 webhooks/go.mod
  223. +540 −0 webhooks/go.sum
  224. +3 −3 webhooks/pkg/apis/instance/v1alpha1/zz_generated.deepcopy.go
  225. +35 −17 webhooks/pkg/client/clientset/versioned/clientset.go
  226. +1 −2 webhooks/pkg/client/clientset/versioned/doc.go
  227. +11 −9 webhooks/pkg/client/clientset/versioned/fake/clientset_generated.go
  228. +1 −2 webhooks/pkg/client/clientset/versioned/fake/doc.go
  229. +2 −3 webhooks/pkg/client/clientset/versioned/fake/register.go
  230. +1 −2 webhooks/pkg/client/clientset/versioned/scheme/doc.go
  231. +1 −2 webhooks/pkg/client/clientset/versioned/scheme/register.go
  232. +1 −2 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/doc.go
  233. +1 −2 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/fake/doc.go
  234. +1 −2 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/fake/fake_instance_client.go
  235. +14 −13 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/fake/fake_sfevent.go
  236. +1 −2 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/generated_expansion.go
  237. +21 −5 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/instance_client.go
  238. +39 −36 webhooks/pkg/client/clientset/versioned/typed/instance/v1alpha1/sfevent.go
  239. +1 −2 webhooks/pkg/client/informers/externalversions/factory.go
  240. +1 −2 webhooks/pkg/client/informers/externalversions/generic.go
  241. +2 −3 webhooks/pkg/client/informers/externalversions/instance/interface.go
  242. +1 −2 webhooks/pkg/client/informers/externalversions/instance/v1alpha1/interface.go
  243. +4 −4 webhooks/pkg/client/informers/externalversions/instance/v1alpha1/sfevent.go
  244. +1 −2 webhooks/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
  245. +1 −2 webhooks/pkg/client/listers/instance/v1alpha1/expansion_generated.go
  246. +6 −2 webhooks/pkg/client/listers/instance/v1alpha1/sfevent.go
  247. +12 −15 webhooks/pkg/webhooks/manager/event.go
  248. +19 −151 webhooks/pkg/webhooks/manager/event_test.go
  249. +1 −2 webhooks/pkg/webhooks/manager/meter/metering_test.go
  250. +0 −56 webhooks/pkg/webhooks/manager/test_resources/admission_request_docker_create.json
  251. +2 −21 webhooks/pkg/webhooks/manager/webhook.go
  252. +3 −5 webhooks/pkg/webhooks/manager/webhook_test.go
36 changes: 20 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ matrix:
os:
- linux
go:
- "1.17"
- "1.21.x"
git:
depth: 3
install:
@@ -24,7 +24,7 @@ matrix:
os:
- linux
go:
- "1.17"
- "1.21.x"
git:
depth: 3
install:
@@ -42,17 +42,15 @@ matrix:
os:
- linux
go:
- "1.17"
- "1.21.x"
git:
depth: 3
before_install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
install:
- pushd interoperator
- env KUBEBUILDER_VERSION=v1.0.7 ./scripts/install_test.sh
- ./scripts/install_test.sh
- popd
- cd webhooks
- dep ensure -v
- env GO111MODULE=on go mod download
- cd ..
script:
- pushd webhooks
@@ -62,18 +60,19 @@ matrix:
os:
- linux
go:
- "1.17"
- "1.21.x"
git:
depth: 3
before_install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- go get golang.org/x/lint/golint
- go get -v honnef.co/go/tools/cmd/staticcheck
- go install honnef.co/go/tools/cmd/staticcheck@latest
install:
- cd interoperator
- env GO111MODULE=on go mod download
- cd ../webhooks
- dep ensure -v
- env GO111MODULE=on go mod download
- cd ../operator-apis
- env GO111MODULE=on go mod download
- cd ..
script:
- pushd interoperator
@@ -87,6 +86,8 @@ matrix:
- go fmt ./pkg/webhooks/manager/... ./pkg/apis/...
- go vet ./pkg/webhooks/manager/... ./pkg/apis/...
- golint ./pkg/webhooks/manager/... ./pkg/apis/...
- PKGS=$(go list ./... | grep -v /vendor/)
- staticcheck $PKGS
- popd
- pushd operator-apis
- go fmt ./internal/...
@@ -96,34 +97,37 @@ matrix:
- staticcheck $PKGS
- popd
- language: node_js
node_js:
- "16.14"
dist: focal
node_js: 18.9
env:
- SETTINGS_PATH="$(pwd)/broker/config/settings.yml"
script:
- npm config set sprin=true
- pushd broker
- npm install -g yarn
- yarn set version 2.4.1
- yarn install
- "npm run test-coverall"
- popd
- language: node_js
dist: focal
node_js:
- "16.14"
- 18.9
env:
- SETTINGS_PATH="$(pwd)/broker/config/settings.yml"
script:
- pushd broker
- npm install -g yarn
- yarn set version 2.4.1
- yarn set version 2.4.3
- yarn install
- "yarn run eslint"
- "yarn run jsdoc"
- "yarn constraints"
- popd
- language: node_js
dist: focal
node_js:
- "16.14"
- "18.9"
before_install:
# - pip install --user truffleHog==2.0.89
- |
31 changes: 17 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Coverage Status](https://coveralls.io/repos/github/cloudfoundry-incubator/service-fabrik-broker/badge.svg?branch=master)](https://coveralls.io/github/cloudfoundry-incubator/service-fabrik-broker?branch=master) [![Travis Build Status](https://app.travis-ci.com/cloudfoundry-incubator/service-fabrik-broker.svg?branch=master)](https://app.travis-ci.com/cloudfoundry-incubator/service-fabrik-broker) [![Go Report Card](https://goreportcard.com/badge/github.com/cloudfoundry-incubator/service-fabrik-broker)](https://goreportcard.com/report/github.com/cloudfoundry-incubator/service-fabrik-broker) [![codecov](https://codecov.io/gh/cloudfoundry-incubator/service-fabrik-broker/branch/master/graph/badge.svg)](https://codecov.io/gh/cloudfoundry-incubator/service-fabrik-broker) [![yarn](https://img.shields.io/badge/maintained%20with-yarn-cc00ff.svg)](https://yarnpkg.com/)
[![Coverage Status](https://coveralls.io/repos/github/cloudfoundry/service-fabrik-broker/badge.svg?branch=master)](https://coveralls.io/github/cloudfoundry/service-fabrik-broker?branch=master) [![Travis Build Status](https://app.travis-ci.com/cloudfoundry/service-fabrik-broker.svg?branch=master)](https://app.travis-ci.com/cloudfoundry/service-fabrik-broker) [![Go Report Card](https://goreportcard.com/badge/github.com/cloudfoundry-incubator/service-fabrik-broker)](https://goreportcard.com/report/github.com/cloudfoundry-incubator/service-fabrik-broker)[![codecov](https://codecov.io/gh/cloudfoundry/service-fabrik-broker/branch/master/graph/badge.svg)](https://codecov.io/gh/cloudfoundry/service-fabrik-broker) [![yarn](https://img.shields.io/badge/maintained%20with-yarn-cc00ff.svg)](https://yarnpkg.com/)

# Service Fabrik Broker aka Interoperator

@@ -9,7 +9,7 @@ In the next sections we first discuss about the Deployment layout of BOSH based

## Service Fabrik Broker Deployment Layout

![Missing](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/gh-pages/img/SF2.0-tam-block-diagram-overview.png?raw=true)
![Missing](https://github.com/cloudfoundry/service-fabrik-broker/blob/gh-pages/img/SF2.0-tam-block-diagram-overview.png?raw=true)
Above is the component diagram of Service Fabrik.
Service Fabrik has been re-designed to a model which is event driven and based on decoupled components which participate and communicate via an [APIServer](https://kubernetes.io/docs/concepts/overview/kubernetes-api/) managed by Service Fabrik.

@@ -19,11 +19,11 @@ To facilitate plugging in external components, we intend to model service Fabrik

This allows capabilities like provisioning and operations on provisioned instances to be built independently and plugged into the Service Fabrik APIServer based on specific requirements.

Steps to Integrate new provisioners are mentioned in [here](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/master/docs/SF2.0.md)
Steps to Integrate new provisioners are mentioned in [here](https://github.com/cloudfoundry/service-fabrik-broker/blob/master/docs/SF2.0.md)

## Interoperator Architecture

Interoperator Architecture is the heart of the OSB framework of Service Fabrik. The details are discussed [here](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/master/docs/Interoperator.md).
Interoperator Architecture is the heart of the OSB framework of Service Fabrik. The details are discussed [here](https://github.com/cloudfoundry/service-fabrik-broker/blob/master/docs/Interoperator.md).

## Deploy Interoperator

@@ -34,12 +34,14 @@ Interoperator uses helm charts for deployment. Interoperator requires **helm ver

You have to deploy and run your own operator. Currently SF-Inter-Operator supports only in-cluster operators, so you have to deploy it in the same cluster where SF-Inter-Operator is deployed.

**NOTE:** It is suggested for Gardener users to refer [this](./docs/Interoperator-Features.md#automatic-kubeconfig-rotation-of-clusters) before either Fresh Deployment or Update of Interoperator

### Deploy Interoperator(Fresh deploy)

#### Deploy using publicly published helm chart (Recommended)
To add service fabrik interoperator helm chart repo
```shell
helm repo add interoperator-charts https://cloudfoundry-incubator.github.io/service-fabrik-broker/helm-charts
helm repo add interoperator-charts https://cloudfoundry.github.io/service-fabrik-broker/helm-charts
helm repo update
```

@@ -51,15 +53,15 @@ helm install --set cluster.host=sf.ingress.< clusterdomain > --namespace interop
#### Deploy using helm chart repo
To deploy using helm chart repo
```
git clone https://github.com/cloudfoundry-incubator/service-fabrik-broker
git clone https://github.com/cloudfoundry/service-fabrik-broker
helm install --set cluster.host=sf.ingress.< clusterdomain > --namespace interoperator interoperator helm-charts/interoperator
```

**NOTE:** `cluster.host` should be within the [63 character limit](http://man7.org/linux/man-pages/man7/hostname.7.html).

### Upgrade existing Interoperator deployment

To check how you can upgrade existing interoperator deployment, please check this document [here](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/master/docs/interoperator-upgrades.md).
To check how you can upgrade existing interoperator deployment, please check this document [here](https://github.com/cloudfoundry/service-fabrik-broker/blob/master/docs/interoperator-upgrades.md).

### Deploy SFClusters, SFServices and SFPlans and Register with Interoperator

@@ -69,7 +71,7 @@ For multi-cluster support, all corresponding sfcluster CRs need to be created an

Please note that `sfservice`, `sfplans` and `sfcluster` (along with the `secret` it refers to) need to be deployed in the same namespace where SF is deployed (default is `interoperator`).

To understand the CRs and their structures, please check the Architecture. The different templates are described in [interoperator-templates](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/master/docs/Interoperator-templates.md)
To understand the CRs and their structures, please check the Architecture. The different templates are described in [interoperator-templates](https://github.com/cloudfoundry/service-fabrik-broker/blob/master/docs/Interoperator-templates.md)

### Deploying multiple interoperator in the same cluster

@@ -87,9 +89,9 @@ You can either register with service manager which then exposes it to consuming

## Other Features

Checkout other features like enabling Service Instance sharing, custom service dashboard and quota management [here](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/master/docs/Interoperator-Features.md).
Checkout other features like enabling Service Instance sharing, custom service dashboard and quota management [here](https://github.com/cloudfoundry/service-fabrik-broker/blob/master/docs/Interoperator-Features.md).

## [Releases](https://github.com/cloudfoundry-incubator/service-fabrik-broker/releases)
## [Releases](https://github.com/cloudfoundry/service-fabrik-broker/releases)

## Local Development Setup (Ubuntu)

@@ -107,14 +109,15 @@ nvm install node
nvm use node
```


* Clone this repo (assuming your working directory is ~/workspace)
```shell
cd ~/workspace
```
* Clone and setup fork and git-secrets ( requires [hub] and [git secrets] to be
installed)
```
sh -c "$(curl -fsSL https://raw.githubusercontent.com/cloudfoundry-incubator/service-fabrik-broker/master/bin/clone-for-development)"
sh -c "$(curl -fsSL https://raw.githubusercontent.com/cloudfoundry/service-fabrik-broker/master/broker/bin/clone-for-development)"
cd service-fabrik-broker/broker
git checkout -b my-new-feature
# make code changes
@@ -168,8 +171,8 @@ curl -sk -u broker:secret -H "X-Broker-Api-Version: 2.9" https://127.0.0.1:9293/

* Launch the Deployment Hooks Process
This process executes action scripts provided by services in restricted environment.
More information on how to configure action scripts is documented here: https://github.com/cloudfoundry-incubator/service-fabrik-broker/wiki/Deployment-hooks-for-service-lifecycle-operations
If you don't want any predeployment action to run please comment out `actions` property in [service](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/rel-2018.T08a/broker/config/settings.yml#L574) and [plan](https://github.com/cloudfoundry-incubator/service-fabrik-broker/blob/rel-2018.T08a/broker/config/settings.yml#L685) from catalog.
More information on how to configure action scripts is documented here: https://github.com/cloudfoundry/service-fabrik-broker/wiki/Deployment-hooks-for-service-lifecycle-operations
If you don't want any predeployment action to run please comment out `actions` property in [service](https://github.com/cloudfoundry/service-fabrik-broker/blob/rel-2018.T08a/broker/config/settings.yml#L574) and [plan](https://github.com/cloudfoundry/service-fabrik-broker/blob/rel-2018.T08a/broker/config/settings.yml#L685) from catalog.

If predeployment actions are present in service catalog then deployment hook process has to be running.
Before starting deployment hooks process, SETTINGS_PATH env variable has to be set.
@@ -316,7 +319,7 @@ cf delete-service -f my-service
```
## How to obtain support

If you need any support, have any question or have found a bug, please report it in the [GitHub bug tracking system](https://github.com/cloudfoundry-incubator/service-fabrik-broker/issues). You can also reach us out on our [Slack Channel](https://cloudfoundry.slack.com/messages/C814KVC59).
If you need any support, have any question or have found a bug, please report it in the [GitHub bug tracking system](https://github.com/cloudfoundry/service-fabrik-broker/issues). You can also reach us out on our [Slack Channel](https://cloudfoundry.slack.com/messages/C814KVC59).

## LICENSE

2 changes: 1 addition & 1 deletion broker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FROM node:14.16-alpine3.13 also works here for a smaller image
FROM node:16.14-alpine3.15
FROM node:18.19.0-alpine3.19

# set our node environment, either development or production
# defaults to production, compose overrides this to development on build and run
4 changes: 2 additions & 2 deletions broker/applications/admin/package.json
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@
"@sf/oob-manager": "*",
"@sf/provisioner-services": "*",
"bluebird": "3.7.2",
"express": "4.17.3",
"express-jwt": "6.0.0",
"express": "4.18.2",
"express-jwt": "8.4.1",
"lodash": "4.17.21"
}
}
Original file line number Diff line number Diff line change
@@ -147,17 +147,23 @@ class ServiceFabrikAdminController extends FabrikBaseController {
spaces = _
.chain(spaces)
.map(resource => {
const entity = resource.entity;
entity.guid = resource.metadata.guid;
const entity = {
guid: resource.guid,
name: resource.name,
organization_guid: resource.relationships.organization.data.guid
};
return entity;
})
.keyBy('guid')
.value();
organizations = _
.chain(organizations)
.map(resource => {
const entity = resource.entity;
entity.guid = resource.metadata.guid;
const entity = {
guid: resource.guid,
name: resource.name,
quota_definition_guid: resource.relationships.quota.data.guid
};
return entity;
})
.keyBy('guid')
@@ -169,6 +175,7 @@ class ServiceFabrikAdminController extends FabrikBaseController {
deployment.organization = organizations[_.get(deployment, 'space.organization_guid')];
}
});

return deployments;
}

4 changes: 2 additions & 2 deletions broker/applications/deployment_hooks/package.json
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@
"@sf/express-commons": "*",
"@sf/logger": "*",
"bluebird": "3.7.2",
"express": "4.17.3",
"express-jwt": "6.0.0",
"express": "4.18.2",
"express-jwt": "8.4.1",
"lodash": "4.17.21"
}
}
7 changes: 3 additions & 4 deletions broker/applications/extensions/package.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@
"@sf/common-controllers": "*",
"@sf/common-utils": "*",
"@sf/db": "*",
"@sf/docker": "*",
"@sf/eventmesh": "*",
"@sf/express-commons": "*",
"@sf/iaas": "*",
@@ -25,12 +24,12 @@
"@sf/models": "*",
"@sf/provisioner-services": "*",
"bluebird": "3.7.2",
"express": "4.17.3",
"express-jwt": "6.0.0",
"express": "4.18.2",
"express-jwt": "8.4.1",
"express-session": "1.17.1",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"moment": "2.29.1",
"moment": "2.30.1",
"session-file-store": "1.4.0"
}
}
Original file line number Diff line number Diff line change
@@ -28,7 +28,6 @@ const {
} = require('@sf/common-controllers');

const DirectorService = require('@sf/provisioner-services').DirectorService;
const DockerService = require('../../../operators/src/docker-operator/DockerService');
const VirtualHostService = require('../../../operators/src/virtualhost-operator/VirtualHostService');

Promise.promisifyAll(crypto, Session.prototype);
@@ -183,9 +182,6 @@ class DashboardController extends FabrikBaseController {
case CONST.INSTANCE_TYPE.DIRECTOR:
resourceType = CONST.APISERVER.RESOURCE_TYPES.DIRECTOR;
break;
case CONST.INSTANCE_TYPE.DOCKER:
resourceType = CONST.APISERVER.RESOURCE_TYPES.DOCKER;
break;
case CONST.INSTANCE_TYPE.VIRTUAL_HOST:
resourceType = CONST.APISERVER.RESOURCE_TYPES.VIRTUALHOST;
break;
@@ -298,17 +294,10 @@ function createService(plan_id, instance_id, context) {
switch (plan.manager.name) {
case CONST.INSTANCE_TYPE.DIRECTOR:
return DirectorService.createInstance(instance_id, options);
case CONST.INSTANCE_TYPE.DOCKER:
if (config.enable_swarm_manager) {
return DockerService.createInstance(instance_id, options);
} else {
assert.fail(plan.manager.name, [CONST.INSTANCE_TYPE.DIRECTOR, CONST.INSTANCE_TYPE.VIRTUAL_HOST], undefined, 'in');
}
break;
case CONST.INSTANCE_TYPE.VIRTUAL_HOST:
return VirtualHostService.createVirtualHostService(instance_id, options);
default:
assert.fail(plan.manager.name, [CONST.INSTANCE_TYPE.DIRECTOR, CONST.INSTANCE_TYPE.DOCKER, CONST.INSTANCE_TYPE.VIRTUAL_HOST], undefined, 'in');
assert.fail(plan.manager.name, [CONST.INSTANCE_TYPE.DIRECTOR, CONST.INSTANCE_TYPE.VIRTUAL_HOST], undefined, 'in');
}
}

Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ const { serviceBrokerClient } = require('@sf/broker-client');
const ScheduleManager = require('@sf/jobs');
const DirectorService = require('@sf/provisioner-services').DirectorService;
const dbManager = require('@sf/db').dbManager;
const docker = config.enable_swarm_manager ? require('@sf/docker') : undefined;
const docker = undefined;
const filename = backupStore.filename;
const CloudControllerError = {
NotAuthorized: err => {
Loading