Skip to content

Commit 48c5905

Browse files
authoredJan 29, 2022
Feature/v1beta1 (#20)
* Bumped underlying CAPI tool versions per CAPI book upgrade instructions. * Removed zap logger. Bumped CAPI to 1.0. Things are _very_ broken atm. * Followed instructions to unify manager role between webhooks and controllers. * Changes to enable individual service accounts for controllers. * Renamed api dir to v1beta1 * Bumped all refs from v1alpha3 to v1beta1. * Build, but probably doesn't actually work yet. * Remove additional steps needed for older CAPC. * Remove zap logger. * Generated via newer controller-gen binary. * Updated to use new style watch functions. * Fixup some defaults for args. * Point to local image. * Bumped version. * Some final cleanup. * Bump v1beta1 in yaml. * Removed insecure package workaround as I believe it is no longer needed. * Trying to pass prow. * Revert to use secure jwt lib. * Remove unsupported versions.
1 parent e1b3a6c commit 48c5905

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+968
-491
lines changed
 

‎Makefile

+3-10
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ undeploy: bin/kustomize ## Undeploy controller from the K8s cluster specified in
134134
.PHONY: binaries
135135
binaries: bin/controller-gen bin/kustomize bin/ginkgo bin/golangci-lint bin/mockgen bin/kubectl ## Locally install all needed bins.
136136
bin/controller-gen: ## Install controller-gen to bin.
137-
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.9
137+
GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1
138138
bin/golangci-lint: ## Install golangci-lint to bin.
139139
GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.43.0
140140
bin/ginkgo: ## Install ginkgo to bin.
@@ -181,19 +181,12 @@ tilt-up: cluster-api kind-cluster cluster-api/tilt-settings.json manifests cloud
181181
export CLOUDSTACK_B64ENCODED_SECRET=$$(base64 -i cloud-config) && cd cluster-api && tilt up
182182

183183
.PHONY: kind-cluster
184-
kind-cluster: cluster-api cluster-api/hack/kind-install-for-capd.sh # Create a kind cluster with a local Docker repository.
184+
kind-cluster: cluster-api # Create a kind cluster with a local Docker repository.
185185
-./cluster-api/hack/kind-install-for-capd.sh
186186

187187
cluster-api: # Clone cluster-api repository for tilt use.
188-
git clone --branch v0.3.24 https://github.com/kubernetes-sigs/cluster-api.git
188+
git clone --branch v1.0.0 https://github.com/kubernetes-sigs/cluster-api.git
189189

190-
# Need script from CAPI v1.0+
191-
# Can delete this target after upgrading to newer CAPI.
192-
cluster-api/hack/kind-install-for-capd.sh: cluster-api
193-
cd cluster-api && git checkout v1.0.0 -- hack/kind-install-for-capd.sh
194-
195-
# Need script from CAPI v1.0+
196-
# Can delete this target after upgrading to newer CAPI.
197190
cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
198191
cp ./hack/tilt-settings.json cluster-api
199192

‎api/v1alpha3/cloudstackcluster_types.go ‎api/v1beta1/cloudstackcluster_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v1alpha3
17+
package v1beta1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
21+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2222
)
2323

2424
const (

0 commit comments

Comments
 (0)
Please sign in to comment.