Merge branch 'main' into renovate/major-4-github-actions

SovereignCloudStack · Dec 19, 2023 · 6c3de3b · 6c3de3b
2 parents 685e9fb + a5eb655
commit 6c3de3b
Show file tree

Hide file tree

Showing 383 changed files with 1,393 additions and 784 deletions.
diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Install go
-      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version-file: "go.mod"
         cache: true

diff --git a/.github/labeler.yaml b/.github/labeler.yaml
@@ -1,16 +1,22 @@
 ---
 area/code:
-  - "controllers/**/*"
-  - "pkg/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "controllers/**/*"
+      - any-glob-to-any-file: "pkg/**/*"
 area/api:
-  - "api/**/*"
-  - "config/crd/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "api/**/*"
+      - any-glob-to-any-file: "config/crd/**/*"
 area/github:
-  - ".github/**/*"
+  - changed-files:
+      - any-glob-to-any-file: ".github/**/*"
 area/hack:
-  - "hack/**/*"
-  - "Makefile"
+  - changed-files:
+      - any-glob-to-any-file: "hack/**/*"
+      - any-glob-to-any-file: "Makefile"
 area/test:
-  - "test/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "test/**/*"
 area/templates:
-  - "templates/**/*"
+  - changed-files:
+      - any-glob-to-any-file: "templates/**/*"
diff --git a/.github/workflows/pr-verify.yaml b/.github/workflows/pr-verify.yaml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Verifier action
         id: verifier
-        uses: kubernetes-sigs/kubebuilder-release-tools@3c3411345eedc489d1022288aa844691e92a9c29 # v0.4.2
+        uses: kubernetes-sigs/kubebuilder-release-tools@012269a88fa4c034a0acf1ba84c26b195c0dbab4 # v0.4.3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -62,7 +62,7 @@ jobs:
             "2000": "XXL"
             }
       - name: Generate Labels
-        uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5
         with:
           configuration-path: .github/labeler.yaml
           repo-token: ${{ steps.generate-token.outputs.token }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -138,7 +138,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install go
-        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version-file: "go.mod"
           cache: true

diff --git a/.github/workflows/report-bin-size.yaml b/.github/workflows/report-bin-size.yaml
@@ -16,7 +16,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Install go
-        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version-file: "go.mod"
           cache: true

diff --git a/.github/workflows/schedule-update-bot.yaml b/.github/workflows/schedule-update-bot.yaml
@@ -44,7 +44,7 @@ jobs:
           echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
 
       - name: Renovate
-        uses: renovatebot/github-action@5c6c06aa0e3d7a6a9b6cba05c078c51631b5f11a # v39.1.1
+        uses: renovatebot/github-action@5d3fbef92a76cbf78f5732d17c07a2e76e6f7555 # v39.1.4
         env:
           RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
           RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'

diff --git a/Makefile b/Makefile
@@ -563,5 +563,5 @@ builder-image-push: ## Build $(CONTROLLER_SHORT)-builder to a new version. For m
 # test: test-unit test-integration ## Runs all unit and integration tests.
 
 .PHONY: tilt-up
-tilt-up:  $(ENVSUBST) $(KUBECTL) $(KUSTOMIZE) $(TILT) cluster  ## Start a mgt-cluster & Tilt. Installs the CRDs and deploys the controllers
+tilt-up: env-vars-for-wl-cluster $(ENVSUBST) $(KUBECTL) $(KUSTOMIZE) $(TILT) cluster  ## Start a mgt-cluster & Tilt. Installs the CRDs and deploys the controllers
 	EXP_CLUSTER_RESOURCE_SET=true $(TILT) up --port=10351
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Package v1alpha1 contains API Schema definitions for the infrastructure.clusterstack.x-k8s.io v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+// +groupName=infrastructure.clusterstack.x-k8s.io
 package v1alpha1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "infrastructure.clusterstack.x-k8s.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha1/openstackclusterstackrelease_types.go b/api/v1alpha1/openstackclusterstackrelease_types.go
@@ -34,12 +34,14 @@ type OpenstackClusterStackReleaseSpec struct {
 
 // OpenstackClusterStackReleaseStatus defines the observed state of OpenstackClusterStackRelease.
 type OpenstackClusterStackReleaseStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	// +optional
+	// +kubebuilder:default:=false
+	Ready bool `json:"ready,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Ready",type="boolean",JSONPath=".status.ready"
 
 // OpenstackClusterStackRelease is the Schema for the openstackclusterstackreleases API.
 type OpenstackClusterStackRelease struct {

diff --git a/api/v1alpha1/openstackclusterstackreleasetemplate_types.go b/api/v1alpha1/openstackclusterstackreleasetemplate_types.go
@@ -25,11 +25,12 @@ import (
 
 // OpenstackClusterStackReleaseTemplateSpec defines the desired state of OpenstackClusterStackReleaseTemplate.
 type OpenstackClusterStackReleaseTemplateSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
+	Template OpenstackClusterStackReleaseTemplateResource `json:"template"`
+}
 
-	// Foo is an example field of OpenstackClusterStackReleaseTemplate. Edit openstackclusterstackreleasetemplate_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
+// OpenstackClusterStackReleaseTemplateResource describes the data needed to create a OpenstackClusterStackRelease from a template.
+type OpenstackClusterStackReleaseTemplateResource struct {
+	Spec OpenstackClusterStackReleaseSpec `json:"spec"`
 }
 
 // OpenstackClusterStackReleaseTemplateStatus defines the observed state of OpenstackClusterStackReleaseTemplate.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...k8s.io_openstackclusterstackreleases.yaml → ...k8s.io_openstackclusterstackreleases.yaml b/...k8s.io_openstackclusterstackreleases.yaml → ...k8s.io_openstackclusterstackreleases.yaml
@@ -4,17 +4,21 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstackclusterstackreleases.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstackclusterstackreleases.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackClusterStackRelease
     listKind: OpenstackClusterStackReleaseList
     plural: openstackclusterstackreleases
     singular: openstackclusterstackrelease
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.ready
+      name: Ready
+      type: boolean
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: OpenstackClusterStackRelease is the Schema for the openstackclusterstackreleases
@@ -44,6 +48,10 @@ spec:
           status:
             description: OpenstackClusterStackReleaseStatus defines the observed state
               of OpenstackClusterStackRelease.
+            properties:
+              ready:
+                default: false
+                type: boolean
             type: object
         type: object
     served: true

diff --git a/...penstackclusterstackreleasetemplates.yaml → ...penstackclusterstackreleasetemplates.yaml b/...penstackclusterstackreleasetemplates.yaml → ...penstackclusterstackreleasetemplates.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstackclusterstackreleasetemplates.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstackclusterstackreleasetemplates.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackClusterStackReleaseTemplate
     listKind: OpenstackClusterStackReleaseTemplateList
@@ -36,10 +36,25 @@ spec:
             description: OpenstackClusterStackReleaseTemplateSpec defines the desired
               state of OpenstackClusterStackReleaseTemplate.
             properties:
-              foo:
-                description: Foo is an example field of OpenstackClusterStackReleaseTemplate.
-                  Edit openstackclusterstackreleasetemplate_types.go to remove/update
-                type: string
+              template:
+                description: OpenstackClusterStackReleaseTemplateResource describes
+                  the data needed to create a OpenstackClusterStackRelease from a
+                  template.
+                properties:
+                  spec:
+                    description: OpenstackClusterStackReleaseSpec defines the desired
+                      state of OpenstackClusterStackRelease.
+                    properties:
+                      foo:
+                        description: Foo is an example field of OpenstackClusterStackRelease.
+                          Edit openstackclusterstackrelease_types.go to remove/update
+                        type: string
+                    type: object
+                required:
+                - spec
+                type: object
+            required:
+            - template
             type: object
           status:
             description: OpenstackClusterStackReleaseTemplateStatus defines the observed

diff --git a/....x-k8s.io_openstacknodeimagereleases.yaml → ....x-k8s.io_openstacknodeimagereleases.yaml b/....x-k8s.io_openstacknodeimagereleases.yaml → ....x-k8s.io_openstacknodeimagereleases.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: openstacknodeimagereleases.infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  name: openstacknodeimagereleases.infrastructure.clusterstack.x-k8s.io
 spec:
-  group: infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  group: infrastructure.clusterstack.x-k8s.io
   names:
     kind: OpenstackNodeImageRelease
     listKind: OpenstackNodeImageReleaseList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,9 +2,9 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml
-- bases/infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml
+- bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:

diff --git a/config/rbac/openstackclusterstackrelease_editor_role.yaml b/config/rbac/openstackclusterstackrelease_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstackclusterstackrelease-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/status
   verbs:

diff --git a/config/rbac/openstackclusterstackrelease_viewer_role.yaml b/config/rbac/openstackclusterstackrelease_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstackclusterstackrelease-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleases/status
   verbs:

diff --git a/config/rbac/openstackclusterstackreleasetemplate_editor_role.yaml b/config/rbac/openstackclusterstackreleasetemplate_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstackclusterstackreleasetemplate-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/status
   verbs:

diff --git a/config/rbac/openstackclusterstackreleasetemplate_viewer_role.yaml b/config/rbac/openstackclusterstackreleasetemplate_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstackclusterstackreleasetemplate-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstackclusterstackreleasetemplates/status
   verbs:

diff --git a/config/rbac/openstacknodeimagerelease_editor_role.yaml b/config/rbac/openstacknodeimagerelease_editor_role.yaml
@@ -12,7 +12,7 @@ metadata:
   name: openstacknodeimagerelease-editor-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases
   verbs:
@@ -24,7 +24,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/status
   verbs:

diff --git a/config/rbac/openstacknodeimagerelease_viewer_role.yaml b/config/rbac/openstacknodeimagerelease_viewer_role.yaml
@@ -12,15 +12,15 @@ metadata:
   name: openstacknodeimagerelease-viewer-role
 rules:
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - infrastructure.clusterstack.x-k8s.io.clusterstack.x-k8s.io
+  - infrastructure.clusterstack.x-k8s.io
   resources:
   - openstacknodeimagereleases/status
   verbs: