Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit f28dd5e

Browse files
authored
Merge branch 'master' into update_rel_notes
2 parents 414347f + 43c9c0d commit f28dd5e

File tree

11 files changed

+43
-29
lines changed

11 files changed

+43
-29
lines changed

examples/powershell/powercli-list-vms.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
## SPDX-License-Identifier: Apache-2.0
44
#######################################################################
55

6-
Import-Module PowerCLI.ViCore
6+
# Import-Module PowerCLI.ViCore
77

88
function handle($context, $payload) {
99
[void](Set-PowerCLIConfiguration -InvalidCertificateAction ignore -Confirm:$false)
1010

1111
$username = $context.secrets.username
1212
$password = $context.secrets.password
13-
$hostname = $payload.host
13+
$hostname = $context.secrets.host
1414

1515
$server = connect-viserver -server $hostname -User $username -Password $password
1616

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
@{
22
PSSlack = 'latest'
3+
'VMware.PowerCLI' = 'latest'
34
}

pkg/dispatchcli/cmd/create_eventdrivertype.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func NewCmdCreateEventDriverType(out io.Writer, errOut io.Writer) *cobra.Command
4141
},
4242
}
4343
cmd.Flags().StringVarP(&cmdFlagApplication, "application", "a", "", "associate with an application")
44-
cmd.Flags().BoolVar(&exposeEventDriverType, "expose", true, "expose the driver externally")
44+
cmd.Flags().BoolVar(&exposeEventDriverType, "expose", false, "expose the driver externally")
4545
return cmd
4646
}
4747

pkg/dispatchcli/cmd/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error
987987
if err != nil {
988988
return errors.Wrapf(err, "Error installing docker-registry chart")
989989
}
990-
serviceName := fmt.Sprintf("%s-%s", config.DockerRegistry.Chart.Chart, config.DockerRegistry.Chart.Release)
990+
serviceName := fmt.Sprintf("%s", config.DockerRegistry.Chart.Chart)
991991
serviceIP, err := getK8sServiceClusterIP(serviceName, config.DockerRegistry.Chart.Namespace)
992992
if err != nil {
993993
return err

pkg/entity-store/postgres.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ func (p *postgresEntityStore) Update(ctx context.Context, lastRevision uint64, e
297297
return 0, errors.Wrap(err, "error updating entity")
298298
}
299299
if rowsAffected != 1 {
300-
log.Errorf("rowsAffected != 1: intead %v", rowsAffected)
301-
return 0, errors.Errorf("error updating entity: no such entity or there's intermidate update")
300+
return 0, errors.Errorf("error updating entity %s/%s: no such entity or there is an intermidate update - %v", entity.GetOrganizationID(), entity.GetName(), lastRevision)
302301
}
303302
entity.setRevision(lastRevision + 1)
304303
return int64(entity.GetRevision()), nil

pkg/event-manager/drivers/entity_handler.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ func (h *EntityHandler) Add(ctx context.Context, obj entitystore.Entity) (err er
4949

5050
// deploy the deployment in k8s cluster
5151

52+
log.Infof("Adding driver %s - expose: %v", driver.Name, driver.Expose)
53+
5254
if err := h.backend.Deploy(ctx, driver); err != nil {
5355
translateErrorToEntityState(driver, err)
5456
return ewrapper.Wrap(err, "error deploying driver")
@@ -99,10 +101,11 @@ func (h *EntityHandler) Delete(ctx context.Context, obj entitystore.Entity) erro
99101

100102
// delete the deployment from k8s cluster
101103
err := h.backend.Delete(ctx, driver)
104+
driver.SetDelete(true)
102105
if err != nil {
103106
translateErrorToEntityState(driver, err)
104107
h.store.Update(ctx, driver.GetRevision(), driver)
105-
return ewrapper.Wrap(err, "error deleting driver")
108+
return h.Error(ctx, driver)
106109
}
107110

108111
if err := h.store.Delete(ctx, driver.OrganizationID, driver.Name, driver); err != nil {
@@ -153,7 +156,7 @@ func (h *EntityHandler) Error(ctx context.Context, obj entitystore.Entity) error
153156
case errReasonDeploymentNotFound:
154157
if driver.GetDelete() {
155158
// in DELETE status, delete driver entity
156-
log.Debugf("%s in delete state, deployment not found, delete entity")
159+
log.Debugf("%s in delete state, deployment not found, delete entity", driver.GetName())
157160
h.store.Delete(ctx, driver.OrganizationID, driver.Name, driver)
158161
recover = true
159162
}

pkg/event-manager/drivers/http_handlers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ func (h *Handlers) deleteDriver(params driverapi.DeleteDriverParams, principal i
246246
})
247247
}
248248
d.Status = entitystore.StatusDELETING
249+
d.SetDelete(true)
249250
if _, err = h.store.Update(ctx, d.Revision, d); err != nil {
250251
log.Errorf("store error when deleting the event driver %s: %+v", d.Name, err)
251252
return driverapi.NewDeleteDriverDefault(500).WithPayload(&v1.Error{

pkg/image-manager/controller.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ func (h *imageEntityHandler) Add(ctx context.Context, obj entitystore.Entity) (e
115115
log.Error(err)
116116
}
117117

118+
i.SetStatus(entitystore.StatusCREATING)
119+
_, err = h.Store.Update(ctx, i.GetRevision(), i)
120+
if err != nil {
121+
span.LogKV("error", err)
122+
log.Error(err)
123+
return
124+
}
125+
118126
defer func() { h.Store.UpdateWithError(ctx, i, err) }()
119127

120128
if i.Status == entitystore.StatusMISSING {
@@ -173,7 +181,6 @@ func (h *imageEntityHandler) Sync(ctx context.Context, resyncPeriod time.Duratio
173181
func (h *imageEntityHandler) Error(ctx context.Context, obj entitystore.Entity) error {
174182
span, ctx := trace.Trace(ctx, "")
175183
defer span.Finish()
176-
177184
_, err := h.Store.Update(ctx, obj.GetRevision(), obj)
178185
return err
179186
}

pkg/service-manager/controller.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
403403
for _, binding := range existing {
404404
log.Debugf("Processing service binding %s [%s]", binding.Name, binding.Status)
405405
if _, ok := serviceMap[binding.ServiceInstance]; !ok {
406-
log.Debugf("Service for binding %s missing, delete", binding.Name)
406+
log.Infof("Service instance for binding %s [%s] missing, delete", binding.Name, binding.ServiceInstance)
407407
// No matching service exists... delete
408408
binding.SetDelete(true)
409409
binding.SetStatus(entitystore.StatusDELETING)
@@ -424,11 +424,14 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
424424
continue
425425
}
426426
actual, ok := actualMap[binding.BindingID]
427-
// If binding isn't present... delete
428-
// TODO (bjung): would it be better to set the status to INITIALIZED and recreate?
427+
// If binding isn't present... recreate
429428
if !ok {
430-
binding.SetDelete(true)
431-
binding.SetStatus(entitystore.StatusDELETING)
429+
log.Infof("Binding %s [%s] missing from service catalog, recreate", binding.Name, binding.ServiceInstance)
430+
if !binding.GetDelete() {
431+
// Since we are recreating, it's not really orphaned.
432+
delete(actualMap, binding.BindingID)
433+
binding.SetStatus(entitystore.StatusINITIALIZED)
434+
}
432435
synced = append(synced, binding)
433436
continue
434437
} else {
@@ -448,6 +451,7 @@ func (h *serviceBindingEntityHandler) Sync(ctx context.Context, resyncPeriod tim
448451
}
449452
// Clean up any orphaned bindings
450453
for _, b := range actualMap {
454+
log.Infof("Binding %s [%s] orphaned from entity store, delete", b.Name, b.ServiceInstance)
451455
b.SetDelete(true)
452456
b.SetStatus(entitystore.StatusDELETING)
453457
synced = append(synced, b)

pkg/service-manager/controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,12 +462,12 @@ func TestServiceBindingSyncReady(t *testing.T) {
462462
assert.Len(t, bindings, 0)
463463

464464
client.On("ListServiceBindings").Return([]entitystore.Entity{}, nil).Once()
465-
// Actual binding missing... delete binding entity (should we recreate?)
465+
// Actual binding missing... recreate binding entity
466466
bindings, err = handler.Sync(context.Background(), time.Duration(1))
467467
assert.NoError(t, err)
468468
assert.Len(t, bindings, 1)
469-
assert.True(t, bindings[0].GetDelete())
470-
assert.Equal(t, entitystore.StatusDELETING, bindings[0].GetStatus())
469+
assert.False(t, bindings[0].GetDelete())
470+
assert.Equal(t, entitystore.StatusINITIALIZED, bindings[0].GetStatus())
471471

472472
// Remove the entity, creating an orphan
473473
err = es.Delete(context.Background(), readyBinding.OrganizationID, readyBinding.Name, &readyBinding)

0 commit comments

Comments
 (0)