Generate CRD schema using github.com/kubernetes-sigs/controller-tools (…

…argoproj#1773)
tkasuz · Jun 27, 2019 · 1e502fb · 1e502fb
1 parent 825a815
commit 1e502fb
Show file tree

Hide file tree

Showing 23 changed files with 4,767 additions and 1,330 deletions.
diff --git a/.argo-ci/ci.yaml b/.argo-ci/ci.yaml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,15 +41,7 @@ commands:
           name: Install Go deps
           command: |
             set -x
-            go get github.com/gobuffalo/packr/packr
-            go get github.com/gogo/protobuf/gogoproto
-            go get github.com/golang/protobuf/protoc-gen-go
-            go get github.com/golangci/golangci-lint/cmd/golangci-lint
-            go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-            go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
-            go get github.com/jstemmer/go-junit-report
-            go get github.com/mattn/goreman
-            go get golang.org/x/tools/cmd/goimports
+            make install-dev-tools
   dep_ensure:
     steps:
       - restore_cache:
@@ -65,12 +57,12 @@ commands:
   install_golang:
     steps:
       - run:
-          name: Install Golang v1.11.4
+          name: Install Golang v1.12.6
           command: |
-            go get golang.org/dl/go1.11.4
-            [ -e /home/circleci/sdk/go1.11.4 ] || go1.11.4 download
+            go get golang.org/dl/go1.12.6
+            [ -e /home/circleci/sdk/go1.12.6 ] || go1.12.6 download
             echo "export GOPATH=/home/circleci/.go_workspace" | tee -a $BASH_ENV
-            echo "export PATH=/home/circleci/sdk/go1.11.4/bin:\$PATH" | tee -a $BASH_ENV
+            echo "export PATH=/home/circleci/sdk/go1.12.6/bin:\$PATH" | tee -a $BASH_ENV
       - run:
           name: Golang diagnostics
           command: |
@@ -176,7 +168,7 @@ commands:
           paths:
             - /home/circleci/.go_workspace
             - /home/circleci/.cache/go-build
-            - /home/circleci/sdk/go1.11.4
+            - /home/circleci/sdk/go1.12.6
   restore_go_cache:
     steps:
       - restore_cache:

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=debian:9.5-slim
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
 # Also used as the image in CI jobs so needs all dependencies
 ####################################################################################################
-FROM golang:1.11.4 as builder
+FROM golang:1.12.6 as builder
 
 RUN apt-get update && apt-get install -y \
     git \
@@ -126,7 +126,7 @@ WORKDIR /home/argocd
 ####################################################################################################
 # Argo CD Build stage which performs the actual build of Argo CD binaries
 ####################################################################################################
-FROM golang:1.11.4 as argocd-build
+FROM golang:1.12.6 as argocd-build
 
 COPY --from=builder /usr/local/bin/dep /usr/local/bin/dep
 COPY --from=builder /usr/local/bin/packr /usr/local/bin/packr

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Makefile b/Makefile
@@ -68,6 +68,21 @@ clientgen:
 .PHONY: codegen
 codegen: protogen clientgen openapigen manifests
 
+.PHONY: install-dev-tools
+install-dev-tools:
+	cd ./hack && \
+	GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/[email protected] && \
+	GO111MODULE=on go get github.com/gobuffalo/packr/[email protected] && \
+	GO111MODULE=on go get github.com/gogo/protobuf/[email protected] && \
+	GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/[email protected] && \
+	GO111MODULE=on go get github.com/golang/protobuf/[email protected] && \
+	GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/[email protected] && \
+	GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/[email protected] && \
+	GO111MODULE=on go get github.com/grpc-ecosystem/grpc-gateway/[email protected] && \
+	GO111MODULE=on go get github.com/jstemmer/go-junit-report && \
+	GO111MODULE=on go get github.com/mattn/goreman && \
+	GO111MODULE=on go get golang.org/x/tools/cmd/goimports
+
 .PHONY: cli
 cli: clean-debug
 	CGO_ENABLED=0 ${PACKR_CMD} build -v -i -ldflags '${LDFLAGS}' -o ${DIST_DIR}/${CLI_NAME} ./cmd/argocd

diff --git a/assets/swagger.json b/assets/swagger.json
@@ -2430,7 +2430,7 @@
     },
     "v1alpha1AppProject": {
       "type": "object",
-      "title": "AppProject provides a logical grouping of applications, providing controls for:\n* where the apps may deploy to (cluster whitelist)\n* what may be deployed (repository whitelist, resource whitelist/blacklist)\n* who can access these applications (roles, OIDC group claims bindings)\n* and what they can do (RBAC policies)\n* automation access to these roles (JWT tokens)\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object",
+      "title": "AppProject provides a logical grouping of applications, providing controls for:\n* where the apps may deploy to (cluster whitelist)\n* what may be deployed (repository whitelist, resource whitelist/blacklist)\n* who can access these applications (roles, OIDC group claims bindings)\n* and what they can do (RBAC policies)\n* automation access to these roles (JWT tokens)\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\n+kubebuilder:resource:path=appprojects,shortName=appproj;appprojs",
       "properties": {
         "metadata": {
           "$ref": "#/definitions/v1ObjectMeta"
@@ -2502,7 +2502,7 @@
     },
     "v1alpha1Application": {
       "type": "object",
-      "title": "Application is a definition of Application resource.\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object",
+      "title": "Application is a definition of Application resource.\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object\n+kubebuilder:resource:path=applications,shortName=app;apps",
       "properties": {
         "metadata": {
           "$ref": "#/definitions/v1ObjectMeta"

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -60,15 +60,7 @@ cd ~/go/src/github.com/argoproj/argo-cd
 Install go dependencies:
 
 ```bash
-go get github.com/gobuffalo/packr/packr
-go get github.com/gogo/protobuf/gogoproto
-go get github.com/golang/protobuf/protoc-gen-go
-go get github.com/golangci/golangci-lint/cmd/golangci-lint
-go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
-go get github.com/jstemmer/go-junit-report
-go get github.com/mattn/goreman
-go get golang.org/x/tools/cmd/goimports
+make install-dev-tools
 ```
 
 ## Building