Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track files generated by make bundle #463

Merged
merged 1 commit into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 1 addition & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
52 changes: 0 additions & 52 deletions bundle-custom.Dockerfile

This file was deleted.

21 changes: 21 additions & 0 deletions bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
83 changes: 83 additions & 0 deletions bundle/manifests/confidentialcontainers.org_peerpodconfigs.yaml
Original file line number Diff line number Diff line change
@@ -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
58 changes: 58 additions & 0 deletions bundle/manifests/confidentialcontainers.org_peerpods.yaml
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions bundle/manifests/controller-manager-metrics-svc_v1_service.yaml
Original file line number Diff line number Diff line change
@@ -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: {}
Loading