Update CC/CBC for onClusterProvisioned bootstrapping (#1553)

* Update CC/CBC for onProvision bootstrapping

* Update CRD

* fixes

* update to tagged versions

* tidy

Author: foot

charts/cluster-controller/values.yaml

@@ -13,7 +13,7 @@ controllerManager:
   manager:
     image:
       repository: docker.io/weaveworks/cluster-controller
-      tag: v1.3.0
+      tag: v1.3.2
     resources:
       limits:
         cpu: 500m

charts/mccp/crds/capi.weave.works_clusterbootstrapconfigs.yaml

@@ -7196,6 +7196,13 @@ spec:
                 - generateName
                 - spec
                 type: object
+              requireClusterProvisioned:
+                description: "Trigger the bootstrapping when the linked cluster has
+                  a True \"ClusterProvisioned\" condition. \n A new job will not be
+                  triggered when the cluster is finally \"Ready\" because it will
+                  already have the annotation that indicates the cluster has been
+                  bootstrapped. \n Defaults to false."
+                type: boolean
               requireClusterReady:
                 description: Wait for the remote cluster to be "ready" before creating
                   the jobs. Defaults to false.

charts/mccp/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   clustersService: docker.io/weaveworks/weave-gitops-enterprise-clusters-service:v0.0.2
   uiServer: docker.io/weaveworks/weave-gitops-enterprise-ui-server:v0.0.2
-  clusterBootstrapController: docker.io/weaveworks/cluster-bootstrap-controller:v0.2.0
+  clusterBootstrapController: weaveworks/cluster-bootstrap-controller:v0.3.0
 
 serviceAccount:
   # Specifies whether a service account should be created

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/weaveworks/weave-gitops v0.9.5
 	github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2
 	github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.25.0
 	k8s.io/cli-runtime v0.25.0
@@ -46,7 +46,7 @@ require (
 	github.com/mkmik/multierror v0.3.0
 	github.com/onsi/ginkgo/v2 v2.1.6
 	github.com/spf13/viper v1.12.0
-	github.com/weaveworks/cluster-controller v1.2.0
+	github.com/weaveworks/cluster-controller v1.3.2
 	github.com/weaveworks/go-checkpoint v0.0.0-20220223124739-fd9899e2b4f2
 	github.com/weaveworks/policy-agent/api v1.0.4
 	github.com/weaveworks/progressive-delivery v0.0.0-20220915081124-d9f0c4063521

go.sum

@@ -1273,8 +1273,8 @@ github.com/valyala/fasthttp v1.30.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD
 github.com/valyala/quicktemplate v1.7.0/go.mod h1:sqKJnoaOF88V07vkO+9FL8fb9uZg/VPSJnLYn+LmLk8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
 github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE=
-github.com/weaveworks/cluster-controller v1.2.0 h1:Q+c5GncBHAf6z7KgvyXM4sCDftC4LfY9d8giD1s8e+w=
-github.com/weaveworks/cluster-controller v1.2.0/go.mod h1:e0Bka2iXVITQG+cG7/u8ZOB5QTaguMmgg+n5nrYaqxQ=
+github.com/weaveworks/cluster-controller v1.3.2 h1:MBM2u5KDHhizXyx0oEByPXejgvg9e1qTQZuYtXgRVrI=
+github.com/weaveworks/cluster-controller v1.3.2/go.mod h1:e0Bka2iXVITQG+cG7/u8ZOB5QTaguMmgg+n5nrYaqxQ=
 github.com/weaveworks/go-checkpoint v0.0.0-20220223124739-fd9899e2b4f2 h1:EWUmjQdHzmBimPxGIus5JOvNPu+tWxOTC+Q4w9fJOok=
 github.com/weaveworks/go-checkpoint v0.0.0-20220223124739-fd9899e2b4f2/go.mod h1:HfUHaw/CuYj2phXCM9etFQwvOQ3W0786feIEs9OMFHk=
 github.com/weaveworks/pipeline-controller/api v0.0.0-20220916165727-cb8504f08c22 h1:Nn0uFFztrATEyTIwYd0yLXKk7Ee9Ndx6P3DFZsU4TxU=