build: update CRDs and k8s dependencies (#68)

ory · May 10, 2021 · 9b8f463 · 9b8f463
1 parent 3fa0cc3
commit 9b8f463
Show file tree

Hide file tree

Showing 12 changed files with 892 additions and 668 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
  build:
   docker:
-   - image: circleci/golang:1.13
+   - image: circleci/golang:1.15
   working_directory: /go/src/github.com/ory/hydra-maester
   steps:
    - run:
@@ -18,19 +18,17 @@ jobs:
        arch=$(go env GOARCH)
 
        # download kubebuilder and extract it to tmp
-       curl -sL https://go.kubebuilder.io/dl/2.0.0-alpha.4/${os}/${arch} | tar -xz -C /tmp/
+       curl -sL https://go.kubebuilder.io/dl/2.3.2/${os}/${arch} | tar -xz -C /tmp/
 
        # move to a long-term location and put it on your path
        # (you'll need to set the KUBEBUILDER_ASSETS env var if you put it somewhere else)
-       sudo mv /tmp/kubebuilder_2.0.0-alpha.4_${os}_${arch} /usr/local/kubebuilder
+       sudo mv /tmp/kubebuilder_2.3.2_${os}_${arch} /usr/local/kubebuilder
        export PATH=$PATH:/usr/local/kubebuilder/bin
 
    - run: make
  test:
   docker:
-   - image: circleci/golang:1.13
-     environment:
-      - GO111MODULE=on
+   - image: circleci/golang:1.15
   working_directory: /go/src/github.com/ory/hydra-maester
   steps:
    - checkout
@@ -41,11 +39,11 @@ jobs:
        arch=$(go env GOARCH)
 
        # download kubebuilder and extract it to tmp
-       curl -sL https://go.kubebuilder.io/dl/2.0.0-alpha.4/${os}/${arch} | tar -xz -C /tmp/
+       curl -sL https://go.kubebuilder.io/dl/2.3.2/${os}/${arch} | tar -xz -C /tmp/
 
        # move to a long-term location and put it on your path
        # (you'll need to set the KUBEBUILDER_ASSETS env var if you put it somewhere else)
-       sudo mv /tmp/kubebuilder_2.0.0-alpha.4_${os}_${arch} /usr/local/kubebuilder
+       sudo mv /tmp/kubebuilder_2.3.2_${os}_${arch} /usr/local/kubebuilder
        export PATH=$PATH:/usr/local/kubebuilder/bin
    - run: make test
  test-integration:
@@ -56,8 +54,8 @@ jobs:
       name: Update golang
       command: |
        sudo rm -rf /usr/local/go/
-       curl -LO https://dl.google.com/go/go1.13.4.linux-amd64.tar.gz
-       sudo tar -C /usr/local -xzf go1.13.4.linux-amd64.tar.gz
+       curl -LO https://dl.google.com/go/go1.15.11.linux-amd64.tar.gz
+       sudo tar -C /usr/local -xzf go1.15.11.linux-amd64.tar.gz
        sudo echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
        go version
 
@@ -68,11 +66,11 @@ jobs:
        arch=$(go env GOARCH)
 
        # download kubebuilder and extract it to tmp
-       curl -sL https://go.kubebuilder.io/dl/2.0.0-alpha.4/${os}/${arch} | tar -xz -C /tmp/
+       curl -sL https://go.kubebuilder.io/dl/2.3.2/${os}/${arch} | tar -xz -C /tmp/
 
        # move to a long-term location and put it on your path
        # (you'll need to set the KUBEBUILDER_ASSETS env var if you put it somewhere else)
-       sudo mv /tmp/kubebuilder_2.0.0-alpha.4_${os}_${arch} /usr/local/kubebuilder
+       sudo mv /tmp/kubebuilder_2.3.2_${os}_${arch} /usr/local/kubebuilder
        sudo echo "export PATH=$PATH:/usr/local/kubebuilder/bin" >> $HOME/.profile
 
    - run:
@@ -86,12 +84,12 @@ jobs:
       name: Install ginkgo,controller-gen
       command: |
        go get github.com/onsi/ginkgo/ginkgo
-       go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.2
+       go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
 
    - run:
       name: Install Kind
       command: |
-       curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64
+       curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/v0.10.0/kind-linux-amd64
        chmod +x ./kind
        sudo mv ./kind /usr/local/bin/kind
    - run:
@@ -107,9 +105,7 @@ jobs:
 
  release:
   docker:
-   - image: circleci/golang:1.13
-     environment:
-      - GO111MODULE=on
+   - image: circleci/golang:1.15
   working_directory: /go/src/github.com/ory/hydra-maester
   steps:
    - checkout

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
 
 all: manager
 
@@ -62,7 +62,7 @@ docker-push:
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.2
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
 CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

diff --git a/api/v1alpha1/oauth2client_types.go b/api/v1alpha1/oauth2client_types.go
@@ -36,7 +36,7 @@ const (
 // HydraAdmin defines the desired hydra admin instance to use for OAuth2Client
 type HydraAdmin struct {
 	// +kubebuilder:validation:MaxLength=64
-	// +kubebuilder:validation:Pattern=(^$|^https?://.*)
+	// +kubebuilder:validation:Pattern=`(^$|^https?://.*)`
 	//
 	// URL is the URL for the hydra instance on
 	// which to set up the client. This value will override the value
@@ -132,7 +132,7 @@ type GrantType string
 // ResponseType represents an OAuth 2.0 response type strings
 type ResponseType string
 
-// +kubebuilder:validation:Pattern=\w+:/?/?[^\s]+
+// +kubebuilder:validation:Pattern=`\w+:/?/?[^\s]+`
 // RedirectURI represents a redirect URI for the client
 type RedirectURI string
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go