Merge branch 'release-v2-dev' into fix/add-crd-shortname

Author: AlinsRan

api/v2/apisixtls_types.go

@@ -36,8 +36,7 @@ type ApisixTlsStatus = ApisixStatus
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=atls
-// +kubebuilder:object:root=true
+// +kubebuilder:resource:shortName=atls,path=apisixtlses
 // +kubebuilder:printcolumn:name="SNIs",type=string,JSONPath=`.spec.hosts`
 // +kubebuilder:printcolumn:name="Secret Name",type=string,JSONPath=`.spec.secret.name`
 // +kubebuilder:printcolumn:name="Secret Namespace",type=string,JSONPath=`.spec.secret.namespace`

config/crd/bases/apisix.apache.org_apisixtls.yaml renamed to config/crd/bases/apisix.apache.org_apisixtlses.yaml

@@ -4,13 +4,13 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.17.2
-  name: apisixtls.apisix.apache.org
+  name: apisixtlses.apisix.apache.org
 spec:
   group: apisix.apache.org
   names:
     kind: ApisixTls
     listKind: ApisixTlsList
-    plural: apisixtls
+    plural: apisixtlses
     shortNames:
     - atls
     singular: apisixtls

config/crd/kustomization.yaml

@@ -10,7 +10,7 @@ resources:
 - bases/apisix.apache.org_apisixroutes.yaml
 - bases/apisix.apache.org_apisixconsumers.yaml
 - bases/apisix.apache.org_apisixglobalrules.yaml
-- bases/apisix.apache.org_apisixtls.yaml
+- bases/apisix.apache.org_apisixtlses.yaml
 - bases/apisix.apache.org_apisixupstreams.yaml
 - bases/apisix.apache.org_apisixpluginconfigs.yaml
 # +kubebuilder:scaffold:crdkustomizeresource

config/rbac/role.yaml

@@ -29,7 +29,7 @@ rules:
   - apisixglobalrules
   - apisixpluginconfigs
   - apisixroutes
-  - apisixtls
+  - apisixtlses
   - apisixupstreams
   - backendtrafficpolicies
   - consumers
@@ -47,7 +47,7 @@ rules:
   - apisixglobalrules/status
   - apisixpluginconfigs/status
   - apisixroutes/status
-  - apisixtls/status
+  - apisixtlses/status
   - apisixupstreams/status
   - backendtrafficpolicies/status
   - consumers/status

internal/manager/controllers.go

@@ -38,15 +38,15 @@ import (
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixglobalrules,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixpluginconfigs,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixroutes,verbs=get;list;watch
-// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtls,verbs=get;list;watch
+// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtlses,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixupstreams,verbs=get;list;watch
 
 // CustomResourceDefinition v2 status
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixconsumers/status,verbs=get;update
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixglobalrules/status,verbs=get;update
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixpluginconfigs/status,verbs=get;update
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixroutes/status,verbs=get;update
-// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtls/status,verbs=get;update
+// +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixtlses/status,verbs=get;update
 // +kubebuilder:rbac:groups=apisix.apache.org,resources=apisixupstreams/status,verbs=get;update
 
 // CustomResourceDefinition

test/e2e/framework/manifests/ingress.yaml

@@ -114,7 +114,7 @@ rules:
   - apisixglobalrules
   - apisixpluginconfigs
   - apisixroutes
-  - apisixtls
+  - apisixtlses
   - apisixupstreams
   - backendtrafficpolicies
   - consumers
@@ -132,7 +132,7 @@ rules:
   - apisixglobalrules/status
   - apisixpluginconfigs/status
   - apisixroutes/status
-  - apisixtls/status
+  - apisixtlses/status
   - apisixupstreams/status
   - backendtrafficpolicies/status
   - consumers/status