Skip to content

Commit 7e9fef6

Browse files
fserucasTristanCacqueray
authored andcommitted
Fix remote executor deploy command
Change-Id: I82995a7ea6f55dc1138aa7db202f1deee132aee8
1 parent 8d1164a commit 7e9fef6

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

controllers/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ func Standalone(cliNS string, kubeContext string, dryRun bool, crPath string, re
8888
fmt.Printf("%s: The remote CR is not standalone\n", remotePath)
8989
os.Exit(1)
9090
}
91+
env.EnsureStandaloneOwner(sf.Spec)
9192
if err := env.setupRemoteExecutorConfig(copyFrom, sf); err != nil {
9293
ctrl.Log.Error(err, "unable to setup remote executor config")
9394
os.Exit(1)

controllers/zuul_external.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func CRSecrets(cr sfv1.SoftwareFactory) []string {
4343
}
4444

4545
func (r *SFKubeContext) copySecrets(eCR sfv1.SoftwareFactory, controlEnv *SFKubeContext) error {
46-
secrets := []string{"zookeeper-client-tls", "zuul-ssh-key"}
46+
secrets := []string{"zuul-keystore-password", "zookeeper-client-tls", "zuul-ssh-key"}
4747
for _, secret := range append(secrets, CRSecrets(eCR)...) {
4848
var sec apiv1.Secret
4949
if !controlEnv.GetM(secret, &sec) {

main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ func main() {
8484

8585
// Flags for the deploy command
8686
deployCmd.PersistentFlags().BoolVar(&dryRun, "dry-run", false, "Shows what resources will be changed by a deploy operation")
87+
var remote string
88+
deployCmd.PersistentFlags().StringVarP(&remote, "remote", "r", "", "Remote CR")
8789

8890
// Global flags
8991
rootCmd.PersistentFlags().StringVarP(&ns, "namespace", "n", "", "The namespace on which to perform actions.")

0 commit comments

Comments
 (0)