Merge pull request #1523 from hongkailiu/fix_dptp

Check app.ci's kubeconfig after loading InClusterConfig

Author: openshift-merge-robot

cmd/dptp-controller-manager/main.go

@@ -256,9 +256,6 @@ func main() {
 	if err != nil {
 		logrus.WithError(err).Fatal("failed to load kubeconfigs")
 	}
-	if _, hasRegistryCluster := kubeconfigs[opts.registryClusterName]; !hasRegistryCluster {
-		logrus.Fatalf("--kubeconfig must include a context named `%s`", opts.registryClusterName)
-	}
 	if _, hasAppCi := kubeconfigs[appCIContextName]; !hasAppCi {
 		kubeconfigs[appCIContextName], err = rest.InClusterConfig()
 		if err != nil {
@@ -267,6 +264,10 @@ func main() {
 		logrus.Infof("Loaded %q context from in-cluster config", appCIContextName)
 	}
 
+	if _, hasRegistryCluster := kubeconfigs[opts.registryClusterName]; !hasRegistryCluster {
+		logrus.Fatalf("--kubeconfig must include a context named `%s`", opts.registryClusterName)
+	}
+
 	ciOPConfigAgent, err := agents.NewConfigAgent(opts.ciOperatorconfigPath)
 	if err != nil {
 		logrus.WithError(err).Fatal("Failed to construct ci-operator config agent")