Track files generated by make bundle

This adds the files generated by `make manifests` :

 config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml
 config/rbac/role.yaml
 config/webhook/manifests.yaml

and `make bundle` :

 bundle/
 bundle.Dockerfile

This will ease Operator SDK upgrades.

Since the bundle is now tracked in the repo, the `bundle-custom.Dockerfile`
file isn't needed anymore by CI. Drop it.

Signed-off-by: Greg Kurz <groug@kaod.org>

.gitignore

@@ -80,10 +80,3 @@ testbin*
 bin/*
 # make generate files
 api/v1/zz_generated.deepcopy.go
-# make manifest files
-config/crd/bases/kataconfiguration.openshift.io_kataconfigs.yaml
-config/rbac/role.yaml
-config/webhook/manifests.yaml
-# make bundle files
-bundle/
-bundle.Dockerfile

Makefile

@@ -291,12 +291,6 @@ catalog-push: ## Push a catalog image.
 
 ##@ Cleanup
 
-.PHONY: manifests-clean
-manifests-clean: ## Clean generated manifests
-	$(RM) -r config/crd/bases
-	$(RM) config/rbac/role.yaml
-	$(RM) config/webhook/manifests.yaml
-
 .PHONY: generate-clean
 generate-clean: ## Clean generated DeepCopy code
 	$(RM) api/v1/zz_generated.deepcopy.go
@@ -305,14 +299,9 @@ generate-clean: ## Clean generated DeepCopy code
 test-clean: ## Clean generated test files
 	$(RM) cover.out
 
-.PHONY: bundle-clean
-bundle-clean: ## Clean generated bundle files
-	$(RM) -r bundle
-	$(RM) bundle.Dockerfile
-
 .PHONY: bin-clean
 bin-clean: ## Clean downloaded binaries
 	$(RM) -r bin
 
 .PHONY: clean
-clean: manifests-clean generate-clean test-clean bundle-clean bin-clean ## Clean all generated files
+clean: generate-clean test-clean bin-clean ## Clean all generated files

bundle.Dockerfile

@@ -0,0 +1,21 @@
+FROM scratch
+
+# Core bundle labels.
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=sandboxed-containers-operator
+LABEL operators.operatorframework.io.bundle.channels.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
+
+# Labels for testing.
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+
+# Copy files to locations specified by labels.
+COPY bundle/manifests /manifests/
+COPY bundle/metadata /metadata/
+COPY bundle/tests/scorecard /tests/scorecard/

bundle/manifests/confidentialcontainers.org_peerpodconfigs.yaml

@@ -0,0 +1,83 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.10.0
+  creationTimestamp: null
+  name: peerpodconfigs.confidentialcontainers.org
+spec:
+  group: confidentialcontainers.org
+  names:
+    kind: PeerPodConfig
+    listKind: PeerPodConfigList
+    plural: peerpodconfigs
+    singular: peerpodconfig
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: PeerPodConfig is the Schema for the peerpodconfigs API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PeerPodConfigSpec defines the desired state of PeerPodConfig
+            properties:
+              cloudSecretName:
+                default: peer-pods-secret
+                description: CloudSecretName is the name of the secret that holds
+                  the credentials for the cloud provider
+                type: string
+              configMapName:
+                default: peer-pods-cm
+                description: ConfigMapName is the name of the configmap that holds
+                  cloud provider specific environment Variables
+                type: string
+              instanceType:
+                description: InstanceType describes the name of the instance type
+                  of the chosen cloud provider
+                type: string
+              limit:
+                description: Limit is the max number of peer pods. This is exposed
+                  as extended resource on nodes
+                type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: NodeSelector selects the nodes on which to run the cloud-api-adaptor
+                  pods
+                type: object
+            required:
+            - cloudSecretName
+            - configMapName
+            type: object
+          status:
+            description: PeerPodConfigStatus defines the observed state of PeerPodConfig
+            properties:
+              setupCompleted:
+                description: SetupCompleted is set to true when all components have
+                  been deployed/created
+                type: boolean
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null

bundle/manifests/confidentialcontainers.org_peerpods.yaml

@@ -0,0 +1,58 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.10.0
+  creationTimestamp: null
+  name: peerpods.confidentialcontainers.org
+spec:
+  group: confidentialcontainers.org
+  names:
+    kind: PeerPod
+    listKind: PeerPodList
+    plural: peerpods
+    singular: peerpod
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: PeerPod is the Schema for the peerpods API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PeerPodSpec defines the desired state of PeerPod
+            properties:
+              cloudProvider:
+                type: string
+              instanceID:
+                type: string
+            type: object
+          status:
+            description: PeerPodStatus defines the observed state of PeerPod
+            properties:
+              cleand:
+                type: boolean
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: null
+  storedVersions: null

bundle/manifests/controller-manager-metrics-svc_v1_service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    control-plane: controller-manager
+  name: controller-manager-metrics-svc
+spec:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  selector:
+    control-plane: controller-manager
+status:
+  loadBalancer: {}