diff --git a/Makefile b/Makefile index fd226c3d..87263e43 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ ifeq ($(ENVIRONMENT),minikube) endif @RUNNING_TESTS=1 go test -parallel=1 "./test/e2e/" -tags "$(BUILDTAGS) cgo" -v -timeout 30m -run "$(E2E_TEST_SELECTOR)" \ - -root=$(CURRENT_DIRECTORY) -kubeconfig=$(HOME)/.kube/config -globalMan deploy/crds/jenkinsio_v1alpha1_jenkins_crd.yaml -namespacedMan deploy/namespace-init.yaml $(EXTRA_ARGS) + -root=$(CURRENT_DIRECTORY) -kubeconfig=$(HOME)/.kube/config -globalMan deploy/crds/jenkins_v1alpha1_jenkins_crd.yaml -namespacedMan deploy/namespace-init.yaml $(EXTRA_ARGS) .PHONY: vet vet: ## Verifies `go vet` passes @@ -311,7 +311,7 @@ minikube-run: export OPERATOR_NAME = $(NAME) minikube-run: start-minikube ## Run the operator locally and use minikube as Kubernetes cluster, you can use EXTRA_ARGS @echo "+ $@" kubectl config use-context minikube - kubectl apply -f deploy/crds/jenkinsio_v1alpha1_jenkins_crd.yaml + kubectl apply -f deploy/crds/jenkins_v1alpha1_jenkins_crd.yaml @echo "Watching '$(WATCH_NAMESPACE)' namespace" build/_output/bin/jenkins-operator $(EXTRA_ARGS) diff --git a/deploy/crds/jenkinsio_v1alpha1_jenkins_cr.yaml b/deploy/crds/jenkins_v1alpha1_jenkins_cr.yaml similarity index 100% rename from deploy/crds/jenkinsio_v1alpha1_jenkins_cr.yaml rename to deploy/crds/jenkins_v1alpha1_jenkins_cr.yaml diff --git a/deploy/crds/jenkinsio_v1alpha1_jenkins_crd.yaml b/deploy/crds/jenkins_v1alpha1_jenkins_crd.yaml similarity index 100% rename from deploy/crds/jenkinsio_v1alpha1_jenkins_crd.yaml rename to deploy/crds/jenkins_v1alpha1_jenkins_crd.yaml diff --git a/docs/developer-guide.md b/docs/developer-guide.md index af36c2cd..7bf2af25 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -31,7 +31,7 @@ make build && make minikube-run EXTRA_ARGS='--minikube --local' Once minikube and **jenkins-operator** are up and running, apply Jenkins custom resource: ```bash -kubectl apply -f deploy/crds/jenkinsio_v1alpha1_jenkins_cr.yaml +kubectl apply -f deploy/crds/jenkins_v1alpha1_jenkins_cr.yaml kubectl get jenkins -o yaml kubectl get po ``` diff --git a/docs/installation.md b/docs/installation.md index 99e18550..7e58258e 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -14,7 +14,7 @@ To run **jenkins-operator**, you will need: Install Jenkins Custom Resource Definition: ```bash -kubectl apply -f https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/deploy/crds/jenkinsio_v1alpha1_jenkins_crd.yaml +kubectl apply -f https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/deploy/crds/jenkins_v1alpha1_jenkins_crd.yaml ``` ## Deploy jenkins-operator diff --git a/go.mod b/go.mod index 22c8218a..27840d08 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/emicklei/go-restful v2.8.1+incompatible // indirect github.com/go-logr/logr v0.1.0 github.com/go-logr/zapr v0.1.0 - github.com/go-openapi/spec v0.18.0 // indirect + github.com/go-openapi/spec v0.18.0 github.com/golang/groupcache v0.0.0-20180924190550-6f2cf27854a4 // indirect github.com/golang/mock v1.2.0 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect diff --git a/pkg/apis/addtoscheme_jenkinsio_v1alpha1.go b/pkg/apis/addtoscheme_jenkins_v1alpha1.go similarity index 75% rename from pkg/apis/addtoscheme_jenkinsio_v1alpha1.go rename to pkg/apis/addtoscheme_jenkins_v1alpha1.go index 6133bfcd..37fad995 100644 --- a/pkg/apis/addtoscheme_jenkinsio_v1alpha1.go +++ b/pkg/apis/addtoscheme_jenkins_v1alpha1.go @@ -1,7 +1,7 @@ package apis import ( - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" ) func init() { diff --git a/pkg/apis/jenkinsio/v1alpha1/doc.go b/pkg/apis/jenkins/v1alpha1/doc.go similarity index 100% rename from pkg/apis/jenkinsio/v1alpha1/doc.go rename to pkg/apis/jenkins/v1alpha1/doc.go diff --git a/pkg/apis/jenkinsio/v1alpha1/jenkins_types.go b/pkg/apis/jenkins/v1alpha1/jenkins_types.go similarity index 98% rename from pkg/apis/jenkinsio/v1alpha1/jenkins_types.go rename to pkg/apis/jenkins/v1alpha1/jenkins_types.go index 9b99403d..4c5d905e 100644 --- a/pkg/apis/jenkinsio/v1alpha1/jenkins_types.go +++ b/pkg/apis/jenkins/v1alpha1/jenkins_types.go @@ -9,6 +9,7 @@ import ( // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. // JenkinsSpec defines the desired state of Jenkins +// +k8s:openapi-gen=true type JenkinsSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file @@ -66,6 +67,7 @@ type Service struct { } // JenkinsStatus defines the observed state of Jenkins +// +k8s:openapi-gen=true type JenkinsStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file @@ -111,6 +113,7 @@ type Build struct { // Jenkins is the Schema for the jenkins API // +k8s:openapi-gen=true +// +kubebuilder:subresource:status type Jenkins struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/pkg/apis/jenkinsio/v1alpha1/register.go b/pkg/apis/jenkins/v1alpha1/register.go similarity index 100% rename from pkg/apis/jenkinsio/v1alpha1/register.go rename to pkg/apis/jenkins/v1alpha1/register.go diff --git a/pkg/apis/jenkinsio/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/jenkins/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/jenkinsio/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/jenkins/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/apis/jenkins/v1alpha1/zz_generated.openapi.go b/pkg/apis/jenkins/v1alpha1/zz_generated.openapi.go new file mode 100644 index 00000000..11602f72 --- /dev/null +++ b/pkg/apis/jenkins/v1alpha1/zz_generated.openapi.go @@ -0,0 +1,153 @@ +// +build !ignore_autogenerated + +// Code generated by openapi-gen. DO NOT EDIT. + +// This file was autogenerated by openapi-gen. Do not edit it manually! + +package v1alpha1 + +import ( + spec "github.com/go-openapi/spec" + common "k8s.io/kube-openapi/pkg/common" +) + +func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { + return map[string]common.OpenAPIDefinition{ + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Jenkins": schema_pkg_apis_jenkins_v1alpha1_Jenkins(ref), + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsSpec": schema_pkg_apis_jenkins_v1alpha1_JenkinsSpec(ref), + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsStatus": schema_pkg_apis_jenkins_v1alpha1_JenkinsStatus(ref), + } +} + +func schema_pkg_apis_jenkins_v1alpha1_Jenkins(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Jenkins is the Schema for the jenkins API", + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsSpec"), + }, + }, + "status": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsStatus"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsSpec", "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_pkg_apis_jenkins_v1alpha1_JenkinsSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "JenkinsSpec defines the desired state of Jenkins", + Properties: map[string]spec.Schema{ + "master": { + SchemaProps: spec.SchemaProps{ + Description: "INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run \"operator-sdk generate k8s\" to regenerate code after modifying this file", + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsMaster"), + }, + }, + "seedJobs": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.SeedJob"), + }, + }, + }, + }, + }, + "service": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Service"), + }, + }, + "slaveService": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Service"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.JenkinsMaster", "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.SeedJob", "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Service"}, + } +} + +func schema_pkg_apis_jenkins_v1alpha1_JenkinsStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "JenkinsStatus defines the observed state of Jenkins", + Properties: map[string]spec.Schema{ + "operatorVersion": { + SchemaProps: spec.SchemaProps{ + Description: "INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run \"operator-sdk generate k8s\" to regenerate code after modifying this file", + Type: []string{"string"}, + Format: "", + }, + }, + "provisionStartTime": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), + }, + }, + "baseConfigurationCompletedTime": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), + }, + }, + "userConfigurationCompletedTime": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), + }, + }, + "builds": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Build"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1.Build", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + } +} diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index 5ef8f87b..ba3201f8 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" diff --git a/pkg/controller/jenkins/configuration/base/reconcile_test.go b/pkg/controller/jenkins/configuration/base/reconcile_test.go index a753d494..15cdeb57 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile_test.go +++ b/pkg/controller/jenkins/configuration/base/reconcile_test.go @@ -3,7 +3,7 @@ package base import ( "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index bf5682d0..7f622245 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go index d06a2157..2f011bed 100644 --- a/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/init_configuration_configmap.go @@ -5,7 +5,7 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "text/template" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/meta.go b/pkg/controller/jenkins/configuration/base/resources/meta.go index ceee93d8..db2cb219 100644 --- a/pkg/controller/jenkins/configuration/base/resources/meta.go +++ b/pkg/controller/jenkins/configuration/base/resources/meta.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go b/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go index bee6f798..1ad14a9b 100644 --- a/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go +++ b/pkg/controller/jenkins/configuration/base/resources/operator_credentials_secret.go @@ -2,9 +2,9 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/pod.go b/pkg/controller/jenkins/configuration/base/resources/pod.go index 9b63969e..93481427 100644 --- a/pkg/controller/jenkins/configuration/base/resources/pod.go +++ b/pkg/controller/jenkins/configuration/base/resources/pod.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go index a0d6e6b4..efa58708 100644 --- a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go @@ -4,7 +4,7 @@ import ( "fmt" "text/template" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/controller/jenkins/configuration/base/resources/service.go index e2c566b2..96a4fffd 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/controller/jenkins/configuration/base/resources/service.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go index dc1c75b0..d014a11c 100644 --- a/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/user_configuration_configmap.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/resources/user_configuration_secret.go b/pkg/controller/jenkins/configuration/base/resources/user_configuration_secret.go index bb9f1c92..b2eeb588 100644 --- a/pkg/controller/jenkins/configuration/base/resources/user_configuration_secret.go +++ b/pkg/controller/jenkins/configuration/base/resources/user_configuration_secret.go @@ -3,7 +3,7 @@ package resources import ( "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/controller/jenkins/configuration/base/validate.go index 0fb038c2..a0eb65a9 100644 --- a/pkg/controller/jenkins/configuration/base/validate.go +++ b/pkg/controller/jenkins/configuration/base/validate.go @@ -5,7 +5,7 @@ import ( "fmt" "regexp" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" "github.com/jenkinsci/kubernetes-operator/pkg/log" diff --git a/pkg/controller/jenkins/configuration/base/validate_test.go b/pkg/controller/jenkins/configuration/base/validate_test.go index c6003ec5..2681cfaf 100644 --- a/pkg/controller/jenkins/configuration/base/validate_test.go +++ b/pkg/controller/jenkins/configuration/base/validate_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/stretchr/testify/assert" diff --git a/pkg/controller/jenkins/configuration/user/casc/caac.go b/pkg/controller/jenkins/configuration/user/casc/caac.go index 3e221f51..cde9d810 100644 --- a/pkg/controller/jenkins/configuration/user/casc/caac.go +++ b/pkg/controller/jenkins/configuration/user/casc/caac.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/jobs" diff --git a/pkg/controller/jenkins/configuration/user/reconcile.go b/pkg/controller/jenkins/configuration/user/reconcile.go index fc7acf4c..55b82259 100644 --- a/pkg/controller/jenkins/configuration/user/reconcile.go +++ b/pkg/controller/jenkins/configuration/user/reconcile.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/casc" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index 7f030fdc..53c98b28 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "fmt" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go index 002fc04e..8e084d27 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/bndr/gojenkins" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/validate.go b/pkg/controller/jenkins/configuration/user/seedjobs/validate.go index 730782f8..629a7a45 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/validate.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/validate.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/go-logr/logr" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go b/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go index 364d30c1..8f5a3e18 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/validate_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/jenkins/configuration/user/validate.go b/pkg/controller/jenkins/configuration/user/validate.go index 5cf122ef..e94e61d7 100644 --- a/pkg/controller/jenkins/configuration/user/validate.go +++ b/pkg/controller/jenkins/configuration/user/validate.go @@ -1,7 +1,7 @@ package user import ( - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/seedjobs" ) diff --git a/pkg/controller/jenkins/groovy/groovy.go b/pkg/controller/jenkins/groovy/groovy.go index d2272188..9319362f 100644 --- a/pkg/controller/jenkins/groovy/groovy.go +++ b/pkg/controller/jenkins/groovy/groovy.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/jobs" diff --git a/pkg/controller/jenkins/handler.go b/pkg/controller/jenkins/handler.go index b4bf84a4..e6a7f683 100644 --- a/pkg/controller/jenkins/handler.go +++ b/pkg/controller/jenkins/handler.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" "github.com/jenkinsci/kubernetes-operator/pkg/log" diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index 27dcebdb..baad81d5 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" diff --git a/pkg/controller/jenkins/jobs/jobs.go b/pkg/controller/jenkins/jobs/jobs.go index d1f68f6a..89144046 100644 --- a/pkg/controller/jenkins/jobs/jobs.go +++ b/pkg/controller/jenkins/jobs/jobs.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/log" diff --git a/pkg/controller/jenkins/jobs/jobs_test.go b/pkg/controller/jenkins/jobs/jobs_test.go index c8ba03f2..6adb2e1d 100644 --- a/pkg/controller/jenkins/jobs/jobs_test.go +++ b/pkg/controller/jenkins/jobs/jobs_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/bndr/gojenkins" diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 84754f61..f4babab9 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index bb170b3f..5fac3782 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 8143a940..6874e7b8 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/jenkinsci/kubernetes-operator/pkg/apis" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" f "github.com/operator-framework/operator-sdk/pkg/test" diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 08963572..75710a23 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" diff --git a/test/e2e/seedjobs_test.go b/test/e2e/seedjobs_test.go index 9b38cd18..b75fa8c4 100644 --- a/test/e2e/seedjobs_test.go +++ b/test/e2e/seedjobs_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/jenkinsci/kubernetes-operator/internal/try" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/user/seedjobs" diff --git a/test/e2e/wait.go b/test/e2e/wait.go index 4f555a0e..34f7f6a7 100644 --- a/test/e2e/wait.go +++ b/test/e2e/wait.go @@ -7,7 +7,7 @@ import ( "time" "github.com/jenkinsci/kubernetes-operator/internal/try" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkinsio/v1alpha1" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha1" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources"