refactor: move Jwker resource from jwker.nais.io/v1 to nais.io/v1

nais · May 7, 2020 · 98dabc5 · 98dabc5
1 parent 24bdcea
commit 98dabc5
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 26 deletions.
diff --git a/api/v1/groupversion_info.go b/api/v1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1 contains API Schema definitions for the jwker v1 API group
 // +kubebuilder:object:generate=true
-// +groupName=jwker.nais.io
+// +groupName=nais.io
 package v1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "jwker.nais.io", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "nais.io", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/config/crd/bases/jwker.nais.io_jwkers.yaml b/config/crd/bases/jwker.nais.io_jwkers.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
-  name: jwkers.jwker.nais.io
+  name: jwkers.nais.io
 spec:
-  group: jwker.nais.io
+  group: nais.io
   names:
     kind: Jwker
     listKind: JwkerList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,7 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/jwker.nais.io_jwkers.yaml
+- bases/nais.io_jwkers.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_jwkers.yaml b/config/crd/patches/cainjection_in_jwkers.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: jwkers.jwker.nais.io
+  name: jwkers.nais.io
diff --git a/config/crd/patches/webhook_in_jwkers.yaml b/config/crd/patches/webhook_in_jwkers.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: jwkers.jwker.nais.io
+  name: jwkers.nais.io
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/jwker_editor_role.yaml b/config/rbac/jwker_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: jwker-editor-role
 rules:
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers/status
   verbs:

diff --git a/config/rbac/jwker_viewer_role.yaml b/config/rbac/jwker_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: jwker-viewer-role
 rules:
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers/status
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -7,7 +7,7 @@ metadata:
   name: manager-role
 rules:
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers
   verbs:
@@ -19,7 +19,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - jwker.nais.io
+  - nais.io
   resources:
   - jwkers/status
   verbs:

diff --git a/config/samples/jwker_v1_jwker.yaml b/config/samples/jwker_v1_jwker.yaml
@@ -5,7 +5,7 @@ metadata:
   name: test
 
 ---
-apiVersion: jwker.nais.io/v1
+apiVersion: nais.io/v1
 kind: Jwker
 metadata:
   name: app1
@@ -21,7 +21,7 @@ spec:
         - application: app2
 
 ---
-apiVersion: jwker.nais.io/v1
+apiVersion: nais.io/v1
 kind: Jwker
 metadata:
   name: app2

diff --git a/controllers/jwker_controller.go b/controllers/jwker_controller.go
@@ -219,8 +219,8 @@ func (r *JwkerReconciler) create(tx transaction) error {
 	return nil
 }
 
-// +kubebuilder:rbac:groups=jwker.nais.io,resources=jwkers,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=jwker.nais.io,resources=jwkers/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=nais.io,resources=jwkers,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=nais.io,resources=jwkers/status,verbs=get;update;patch
 
 func (r *JwkerReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	ctx := context.Background()

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -161,7 +161,7 @@ func fixtures(cli client.Client) error {
 				Namespace: namespace,
 				Labels: map[string]string{
 					"app":  appName,
-					"type": "jwker.nais.io",
+					"type": "nais.io",
 				},
 			},
 			StringData: map[string]string{
@@ -185,7 +185,7 @@ func fixtures(cli client.Client) error {
 				Namespace: namespace,
 				Labels: map[string]string{
 					"app":  appName,
-					"type": "jwker.nais.io",
+					"type": "nais.io",
 				},
 			},
 		},

diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
@@ -12,4 +12,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-*/
+*/
diff --git a/jwker.yaml b/jwker.yaml
@@ -62,9 +62,9 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
-  name: jwkers.jwker.nais.io
+  name: jwkers.nais.io
 spec:
-  group: jwker.nais.io
+  group: nais.io
   names:
     kind: Jwker
     listKind: JwkerList

diff --git a/pkg/metrics/jwkermetrics.go b/pkg/metrics/jwkermetrics.go
@@ -39,7 +39,7 @@ func RefreshTotalJwkerClusterMetrics(cli client.Client) error {
 
 	var secretList v1.SecretList
 	var mLabels = client.MatchingLabels{}
-	mLabels["type"] = "jwker.nais.io"
+	mLabels["type"] = "nais.io"
 	var jwkerList jwkerv1.JwkerList
 
 	t := time.NewTicker(exp)

diff --git a/pkg/secret/secrets.go b/pkg/secret/secrets.go
@@ -36,7 +36,7 @@ func CreateSecretSpec(app tokendings.ClientId, secretName string, clientPrivateJ
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      secretName,
 			Namespace: app.Namespace,
-			Labels:    map[string]string{"app": app.Name, "type": "jwker.nais.io"},
+			Labels:    map[string]string{"app": app.Name, "type": "nais.io"},
 		},
 		StringData: stringdata,
 		Type:       "Opaque",
@@ -81,7 +81,7 @@ func ClusterSecrets(ctx context.Context, app tokendings.ClientId, cli client.Cli
 	var mLabels = client.MatchingLabels{}
 
 	mLabels["app"] = app.Name
-	mLabels["type"] = "jwker.nais.io"
+	mLabels["type"] = "nais.io"
 	if err := cli.List(ctx, &secrets, client.InNamespace(app.Namespace), mLabels); err != nil {
 		return secrets, err
 	}

diff --git a/version.sh b/version.sh
@@ -4,4 +4,4 @@ test -z "$(git ls-files --exclude-standard --others)"
 if [ $? -ne 0 ]; then
   dirty="-dirty"
 fi
-echo $(date "+%Y-%m-%d")-$(git --no-pager log -1 --pretty=%h)${dirty}
+echo $(date "+%Y-%m-%d")-$(git --no-pager log -1 --pretty=%h)${dirty}