machineconfiguration/v1alpha1: add PinnedImageSet

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
openshift · Mar 21, 2024 · 49f8b63 · 49f8b63
1 parent cac7ffe
commit 49f8b63
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 1,282 deletions.
diff --git a/machineconfiguration/v1/0000_80_machineconfigpool-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1/0000_80_machineconfigpool-CustomNoUpgrade.crd.yaml
diff --git a/machineconfiguration/v1/0000_80_machineconfigpool-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/0000_80_machineconfigpool-TechPreviewNoUpgrade.crd.yaml
diff --git a/machineconfiguration/v1/Makefile b/machineconfiguration/v1/Makefile
@@ -0,0 +1,3 @@
+.PHONY: test
+test:
+	make -C ../../tests test GINKGO_EXTRA_ARGS=--focus="machineconfiguration.openshift.io/v1"
diff --git a/machineconfiguration/v1/custom.machineconfigpool.testsuite.yaml b/machineconfiguration/v1/custom.machineconfigpool.testsuite.yaml
@@ -1,9 +1,18 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Custom] MachineConfigPool"
-crd: 0000_80_machineconfigpool-TechPreviewNoUpgrade.crd.yaml
+crd: 0000_80_machine-config_01_machineconfigpools-CustomNoUpgrade.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal MachineConfigPool
+    initial: |
+      apiVersion: machineconfiguration.openshift.io/v1
+      kind: MachineConfigPool
+      spec: {} # No spec is required for a MachineConfigPool
+    expected: |
+      apiVersion: machineconfiguration.openshift.io/v1
+      kind: MachineConfigPool
+      spec: {}
+  - name: Should be able to create a PinnedImageSet
     initial: |
       apiVersion: machineconfiguration.openshift.io/v1
       kind: MachineConfigPool

diff --git a/machineconfiguration/v1/stable.machineconfigpool.testsuite.yaml b/machineconfiguration/v1/stable.machineconfigpool.testsuite.yaml
@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Default] MachineConfigPool"
-crd: 0000_80_machineconfigpool-Default.crd.yaml
+crd: 0000_80_machine-config_01_machineconfigpools-Default.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal MachineConfigPool

diff --git a/machineconfiguration/v1/techpreview.machineconfigpool.testsuite.yaml b/machineconfiguration/v1/techpreview.machineconfigpool.testsuite.yaml
@@ -1,9 +1,18 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[TechPreview] MachineConfigPool"
-crd: 0000_80_machineconfigpool-TechPreviewNoUpgrade.crd.yaml
+crd: 0000_80_machine-config_01_machineconfigpools-TechPreviewNoUpgrade.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal MachineConfigPool
+    initial: |
+      apiVersion: machineconfiguration.openshift.io/v1
+      kind: MachineConfigPool
+      spec: {} # No spec is required for a MachineConfigPool
+    expected: |
+      apiVersion: machineconfiguration.openshift.io/v1
+      kind: MachineConfigPool
+      spec: {}
+  - name: Should be able to create a PinnedImageSet
     initial: |
       apiVersion: machineconfiguration.openshift.io/v1
       kind: MachineConfigPool

diff --git a/machineconfiguration/v1alpha1/custom.pinnedimageset.testsuite.yaml b/machineconfiguration/v1alpha1/custom.pinnedimageset.testsuite.yaml
@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[Custom] PinnedImageSet"
-crd: 0000_80_pinnedimageset-CustomNoUpgrade.crd.yaml
+crd: 0000_80_machine-config_01_pinnedimagesets-CustomNoUpgrade.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal PinnedImageSet
@@ -84,4 +84,4 @@ tests:
       spec:
         pinnedImages:
         - name: "my-project/image@sha256:abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890"
-    expectedError: "Invalid value: \"string\": The OCI Image reference must be in the format host[:port][/namespace]/name@sha256:<digest> with a valid SHA256 digest"
+    expectedError: "Invalid value: \"string\": The OCI Image reference must be in the format host[:port][/namespace]/name@sha256:<digest> with a valid SHA256 digest"
diff --git a/machineconfiguration/v1alpha1/techpreview.pinnedimageset.testsuite.yaml b/machineconfiguration/v1alpha1/techpreview.pinnedimageset.testsuite.yaml
@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "[TechPreview] PinnedImageSet"
-crd: 0000_80_pinnedimageset-TechPreviewNoUpgrade.crd.yaml
+crd: 0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml
 tests:
   onCreate:
   - name: Should be able to create a minimal PinnedImageSet

diff --git a/machineconfiguration/v1alpha1/types_pinnedimageset.go b/machineconfiguration/v1alpha1/types_pinnedimageset.go
@@ -10,7 +10,7 @@ import (
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=pinnedimagesets,scope=Cluster
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1713
-// +openshift:file-pattern=0000_80_pinnedimagesetMARKERS.crd.yaml
+// +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
 // +openshift:enable:FeatureGate=PinnedImages
 // +kubebuilder:metadata:labels=openshift.io/operator-managed=
 

diff --git a/...0_pinnedimageset-CustomNoUpgrade.crd.yaml → ..._pinnedimagesets-CustomNoUpgrade.crd.yaml b/...0_pinnedimageset-CustomNoUpgrade.crd.yaml → ..._pinnedimagesets-CustomNoUpgrade.crd.yaml
diff --git a/...nedimageset-TechPreviewNoUpgrade.crd.yaml → ...edimagesets-TechPreviewNoUpgrade.crd.yaml b/...nedimageset-TechPreviewNoUpgrade.crd.yaml → ...edimagesets-TechPreviewNoUpgrade.crd.yaml
diff --git a/...onfiguration/v1alpha1/zz_generated.crd-manifests/pinnedimagesets-CustomNoUpgrade.crd.yaml b/...onfiguration/v1alpha1/zz_generated.crd-manifests/pinnedimagesets-CustomNoUpgrade.crd.yaml
diff --git a/...uration/v1alpha1/zz_generated.crd-manifests/pinnedimagesets-TechPreviewNoUpgrade.crd.yaml b/...uration/v1alpha1/zz_generated.crd-manifests/pinnedimagesets-TechPreviewNoUpgrade.crd.yaml
diff --git a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
@@ -76,9 +76,9 @@ pinnedimagesets.machineconfiguration.openshift.io:
   Category: ""
   FeatureGates:
   - PinnedImages
-  FilenameOperatorName: ""
-  FilenameOperatorOrdering: ""
-  FilenameRunLevel: ""
+  FilenameOperatorName: machine-config
+  FilenameOperatorOrdering: "01"
+  FilenameRunLevel: "0000_80"
   GroupName: machineconfiguration.openshift.io
   HasStatus: false
   KindName: PinnedImageSet

diff --git a/...regated-crd-manifests/pinnedimagesets.machineconfiguration.openshift.io/PinnedImages.yaml b/...regated-crd-manifests/pinnedimagesets.machineconfiguration.openshift.io/PinnedImages.yaml
@@ -3,6 +3,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1713
+    api.openshift.io/filename-cvo-runlevel: "0000_80"
+    api.openshift.io/filename-operator: machine-config
+    api.openshift.io/filename-ordering: "01"
     feature-gate.release.openshift.io/PinnedImages: "true"
   labels:
     openshift.io/operator-managed: ""