Merge pull request #1554 from flanksource/set-resource-id-for-canary-…

Merge pull request #1554 from flanksource/set-resource-id-for-canary-… #3064