Merge branch 'openstack-k8s-operators:main' into lpiwowar-end-of-maintenance

Author: lpiwowar

.github/workflows/force-bump-pr-manual.yaml

@@ -0,0 +1,13 @@
+name: Manually Trigger a Force Bump PR
+
+on:
+  workflow_dispatch:
+
+jobs:
+  call-build-workflow:
+    uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-pull-request.yaml@main
+    with:
+      operator_name: test
+      branch_name: ${{ github.ref_name }}
+    secrets:
+      FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

.github/workflows/force-bump-pr-scheduled.yaml

@@ -0,0 +1,14 @@
+name: Scheduled Force Bump PR
+
+on:
+  schedule:
+    - cron: '0 7 * * 6'  # 7AM UTC Saturday
+
+jobs:
+  call-build-workflow:
+    if: github.ref == 'refs/heads/main' && github.repository_owner == 'openstack-k8s-operators'
+    uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
+    with:
+      operator_name: test
+    secrets:
+      FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

.pre-commit-config.yaml

@@ -25,6 +25,12 @@ repos:
       entry: make
       args: ['operator-lint']
       pass_filenames: false
+    - id: make-crd-schema-check
+      name: make-crd-schema-check
+      language: system
+      entry: make
+      args: ['crd-schema-check']
+      pass_filenames: false
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.4.0

.zuul.yaml

@@ -11,6 +11,7 @@
               - openstack-k8s-operators-content-provider
             vars:
               cifmw_test_operator_bundle: "{{ content_provider_registry_ip }}:5001/openstack-k8s-operators/test-operator:{{ zuul.patchset }}"
+              cifmw_test_operator_version: "{{ zuul.patchset }}"
     periodic:
       jobs:
         - openstack-k8s-operators-content-provider:
@@ -22,7 +23,7 @@
 
 - job:
     name: podified-multinode-edpm-deployment-crc-test-operator
-    parent: podified-multinode-edpm-deployment-crc
+    parent: podified-multinode-hci-deployment-crc-1comp-backends
     vars:
       cifmw_install_yamls_whitelisted_vars:
         - 'TEST_REPO'
@@ -41,6 +42,8 @@
           type: tobiko
         - name: ansibletest
           type: ansibletest
+        - name: horizontest
+          type: horizontest
 
       # Tempest
       cifmw_run_tempest: true
@@ -67,18 +70,26 @@
         tempest.api.identity.admin.v3.test_users.UsersV3TestJSON.test_update_user_password
       cifmw_test_operator_tempest_expected_failures_list: |
         foobar
-      cifmw_tempest_tempestconf_config:
+      cifmw_test_operator_tempest_tempestconf_config:
         overrides: |
           compute-feature-enabled.dhcp_domain ''
+          dashboard.dashboard_url https://horizon-openstack.apps-crc.testing/dashboard/
+          dashboard.login_url https://horizon-openstack.apps-crc.testing/dashboard/auth/login/
+          dashboard.disable_ssl_certificate_validation True
           identity.v3_endpoint_type public
           service_available.swift false
           service_available.cinder false
+          service_available.horizon True
       cifmw_test_operator_tempest_workflow:
         - stepName: 'full'
         - stepName: 'single-test'
           tempestRun:
             includeList: |
               tempest.api.compute.admin.test_flavors.FlavorsAdminTestJSON.test_create_flavor_using_string_ram
+            concurrency: 8
+          tempestconfRun:
+            collectTiming: true
+
       cifmw_test_operator_tempest_extra_images:
         - URL: https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img
           name: cirros-0.6.2-test-operator
@@ -91,6 +102,21 @@
       cifmw_test_operator_tempest_ntp_extra_images: https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img
       cifmw_test_operator_tempest_network_attachments:
         - ctlplane
+      cifmw_test_operator_tempest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - Tempest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       # Tobiko
       cifmw_run_tobiko: true
@@ -102,6 +128,43 @@
           testenv: 'sanity'
       cifmw_test_operator_tobiko_network_attachments:
         - ctlplane
+      cifmw_test_operator_tobiko_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - Tobiko
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
+
+      # Horizontest
+      cifmw_run_horizontest: true
+      cifmw_test_operator_horizontest_auth_url: "https://keystone-public-openstack.apps-crc.testing"
+      cifmw_test_operator_horizontest_dashboard_url: "https://horizon-openstack.apps-crc.testing/"
+      cifmw_test_operator_horizontest_extra_flag: "not pagination and test_users.py"
+      cifmw_test_operator_horizontest_project_name_xpath: //*[@class="context-project"]//ancestor::ul
+      cifmw_test_operator_horizontest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - HorizonTest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       # Ansibletest
       run_ansibletest: true
@@ -114,6 +177,31 @@
       cifmw_test_operator_ansibletest_ansible_var_files: |
         ---
         foo: bar
+      cifmw_test_operator_ansibletest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - AnsibleTest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
+
+      pre_deploy:
+        - name: 61 HCI pre deploy kustomizations
+          type: playbook
+          source: control_plane_hci_pre_deploy.yml
+        - name: 80 Kustomize OpenStack CR
+          type: playbook
+          source: control_plane_horizon.yml
+
+
     required-projects: &rp
       - name: openstack-k8s-operators/install_yamls
         override-checkout: main

Makefile

@@ -348,3 +348,20 @@ operator-lint: gowork ## Runs operator-lint
 .PHONY: docs
 docs: ## Create documentation under docs/build/html
 	docs/build-docs.sh
+
+BRANCH=main
+.PHONY: force-bump
+force-bump: ## Force bump operator and lib-common dependencies
+	for dep in $$(cat go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|test-operator|^replace' | awk '{print $$1}'); do \
+		go get $$dep@$(BRANCH) ; \
+	done
+	for dep in $$(cat api/go.mod | grep openstack-k8s-operators | grep -vE -- 'indirect|test-operator|^replace' | awk '{print $$1}'); do \
+		cd ./api && go get $$dep@$(BRANCH) && cd .. ; \
+	done
+
+CRD_SCHEMA_CHECKER_VERSION ?= release-4.16
+
+PHONY: crd-schema-check
+crd-schema-check: manifests
+	INSTALL_DIR=$(LOCALBIN) CRD_SCHEMA_CHECKER_VERSION=$(CRD_SCHEMA_CHECKER_VERSION) hack/build-crd-schema-checker.sh
+	INSTALL_DIR=$(LOCALBIN) BASE_REF="$${PULL_BASE_SHA:-$(BRANCH)}" hack/crd-schema-checker.sh

README.md

@@ -76,6 +76,10 @@ ENABLE_WEBHOOKS=false make run
 
 **NOTE:** You can also run this in one step by running: `ENABLE_WEBHOOKS=false make install run`
 
+Now that test-operator is automatically deployed in the podified environment,
+you need to additionally delete the test-operator controller manager to test
+local changes. For more information, check out the section *Running Test Operator Locally*
+in our documentation.
 
 ## License