From aede8f0f9ff18160b19004570b00dc6ae619c734 Mon Sep 17 00:00:00 2001 From: Vanessasaurus <814322+vsoch@users.noreply.github.com> Date: Sun, 30 Jul 2023 18:42:09 -0600 Subject: [PATCH] remove bundle and catalog (#198) I do not want to maintain extra stuffs that are likely not used, namely the bundle / catalog. Signed-off-by: vsoch --- .github/workflows/build-deploy.yaml | 2 +- bundle.Dockerfile | 20 -- .../flux-framework.org_miniclusters.yaml | 165 --------- ...er-manager-metrics-service_v1_service.yaml | 17 - .../operator-manager-config_v1_configmap.yaml | 17 - ...c.authorization.k8s.io_v1_clusterrole.yaml | 10 - .../operator.clusterserviceversion.yaml | 328 ------------------ bundle/metadata/annotations.yaml | 14 - bundle/tests/scorecard/config.yaml | 70 ---- 9 files changed, 1 insertion(+), 642 deletions(-) delete mode 100644 bundle.Dockerfile delete mode 100644 bundle/manifests/flux-framework.org_miniclusters.yaml delete mode 100644 bundle/manifests/operator-controller-manager-metrics-service_v1_service.yaml delete mode 100644 bundle/manifests/operator-manager-config_v1_configmap.yaml delete mode 100644 bundle/manifests/operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml delete mode 100644 bundle/manifests/operator.clusterserviceversion.yaml delete mode 100644 bundle/metadata/annotations.yaml delete mode 100644 bundle/tests/scorecard/config.yaml diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml index 40e5087d..5f3e317b 100644 --- a/.github/workflows/build-deploy.yaml +++ b/.github/workflows/build-deploy.yaml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - command: [bundle, catalog, docker] + command: [docker] name: make and build ${{ matrix.command }} steps: diff --git a/bundle.Dockerfile b/bundle.Dockerfile deleted file mode 100644 index ea8a16e0..00000000 --- a/bundle.Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -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=operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2 -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/ diff --git a/bundle/manifests/flux-framework.org_miniclusters.yaml b/bundle/manifests/flux-framework.org_miniclusters.yaml deleted file mode 100644 index 5ba2a94e..00000000 --- a/bundle/manifests/flux-framework.org_miniclusters.yaml +++ /dev/null @@ -1,165 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.9.0 - creationTimestamp: null - name: miniclusters.flux-framework.org -spec: - group: flux-framework.org - names: - kind: MiniCluster - listKind: MiniClusterList - plural: miniclusters - singular: minicluster - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: MiniCluster is the Schema for a Flux job launcher on K8s - 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: MiniCluster defines the desired state of a Flux MiniCluster - "I am a Flux user and I want to launch a MiniCluster for my job!" A - MiniCluster corresponds to a Batch Job -> StatefulSet + ConfigMaps A - "task" within that cluster is flux running something. - properties: - command: - description: Single user executable to provide to flux start - type: string - deadlineSeconds: - default: 31500000 - description: Should the job be limited to a particular number of seconds? - Approximately one year. This cannot be zero or job won't start - format: int64 - type: integer - diagnostics: - description: Run flux diagnostics on start instead of command - type: boolean - image: - default: fluxrm/flux-sched:focal - description: Container image must contain flux and flux-sched install - type: string - imagePullSecret: - description: Allow the user to pull authenticated images By default - no secret is selected. Setting this with the name of an already - existing imagePullSecret will specify that secret in the pod spec. - type: string - pullAlways: - default: false - description: Allow the user to dictate pulling By default we pull - if not present. Setting this to true will indicate to pull always - type: boolean - size: - default: 1 - description: Size (number of jobs to run) - format: int32 - type: integer - workingDir: - description: Working directory to run command from - type: string - required: - - image - type: object - status: - description: MiniClusterStatus defines the observed state of Flux - properties: - conditions: - description: conditions hold the latest Flux Job and MiniCluster states - items: - description: "Condition contains details for one aspect of the current - state of this API Resource. --- This struct is intended for direct - use as an array at the field path .status.conditions. For example, - \n type FooStatus struct{ // Represents the observations of a - foo's current state. // Known .status.conditions.type are: \"Available\", - \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge - // +listType=map // +listMapKey=type Conditions []metav1.Condition - `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" - protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" - properties: - lastTransitionTime: - description: lastTransitionTime is the last time the condition - transitioned from one status to another. This should be when - the underlying condition changed. If that is not known, then - using the time when the API field changed is acceptable. - format: date-time - type: string - message: - description: message is a human readable message indicating - details about the transition. This may be an empty string. - maxLength: 32768 - type: string - observedGeneration: - description: observedGeneration represents the .metadata.generation - that the condition was set based upon. For instance, if .metadata.generation - is currently 12, but the .status.conditions[x].observedGeneration - is 9, the condition is out of date with respect to the current - state of the instance. - format: int64 - minimum: 0 - type: integer - reason: - description: reason contains a programmatic identifier indicating - the reason for the condition's last transition. Producers - of specific condition types may define expected values and - meanings for this field, and whether the values are considered - a guaranteed API. The value should be a CamelCase string. - This field may not be empty. - maxLength: 1024 - minLength: 1 - pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ - type: string - status: - description: status of the condition, one of True, False, Unknown. - enum: - - "True" - - "False" - - Unknown - type: string - type: - description: type of condition in CamelCase or in foo.example.com/CamelCase. - --- Many .condition.type values are consistent across resources - like Available, but because arbitrary conditions can be useful - (see .node.status.conditions), the ability to deconflict is - important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) - maxLength: 316 - pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ - type: string - required: - - lastTransitionTime - - message - - reason - - status - - type - type: object - type: array - jobid: - description: The JobUid is set internally to associate to a miniCluster - type: string - required: - - jobid - type: object - type: object - served: true - storage: true - subresources: - status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: null - storedVersions: null diff --git a/bundle/manifests/operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/operator-controller-manager-metrics-service_v1_service.yaml deleted file mode 100644 index 68d6127b..00000000 --- a/bundle/manifests/operator-controller-manager-metrics-service_v1_service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - creationTimestamp: null - labels: - control-plane: controller-manager - name: operator-controller-manager-metrics-service -spec: - ports: - - name: https - port: 8443 - protocol: TCP - targetPort: https - selector: - control-plane: controller-manager -status: - loadBalancer: {} diff --git a/bundle/manifests/operator-manager-config_v1_configmap.yaml b/bundle/manifests/operator-manager-config_v1_configmap.yaml deleted file mode 100644 index aa1318b5..00000000 --- a/bundle/manifests/operator-manager-config_v1_configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :8081 - metrics: - bindAddress: 127.0.0.1:8080 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: 14dde902.flux-framework.org -kind: ConfigMap -metadata: - name: operator-manager-config diff --git a/bundle/manifests/operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml deleted file mode 100644 index 298cb959..00000000 --- a/bundle/manifests/operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - creationTimestamp: null - name: operator-metrics-reader -rules: -- nonResourceURLs: - - /metrics - verbs: - - get diff --git a/bundle/manifests/operator.clusterserviceversion.yaml b/bundle/manifests/operator.clusterserviceversion.yaml deleted file mode 100644 index 9aa4febd..00000000 --- a/bundle/manifests/operator.clusterserviceversion.yaml +++ /dev/null @@ -1,328 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: |- - [ - { - "apiVersion": "flux-framework.org/v1alpha1", - "kind": "MiniCluster", - "metadata": { - "name": "flux-sample", - "namespace": "flux-operator" - }, - "spec": { - "command": "mpirun -x PATH -np 2 --map-by socket lmp -v x 2 -v y 2 -v z 2 -in in.reaxc.hns -nocite", - "diagnostics": false, - "image": "ghcr.io/flux-framework/demo-lammps-mpi:flux-sched-focal-v0.22.0", - "pullAlways": false, - "size": 6, - "workingDir": "/home/flux/examples/reaxff/HNS" - } - } - ] - capabilities: Basic Install - operators.operatorframework.io/builder: operator-sdk-v1.22.2 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: operator.v0.0.1 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - kind: MiniCluster - name: miniclusters.flux-framework.org - version: v1alpha1 - description: The Flux Framework Operator to run a Flux MiniCluster - displayName: flux-operator - icon: - - base64data: "" - mediatype: "" - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - events - verbs: - - create - - update - - watch - - apiGroups: - - batch - resources: - - jobs - verbs: - - get - - list - - patch - - update - - watch - - apiGroups: - - batch - resources: - - jobs/status - verbs: - - get - - apiGroups: - - flux-framework.org - resources: - - "" - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - configmaps - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - jobs - verbs: - - create - - delete - - exec - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - miniclusters - verbs: - - create - - delete - - exec - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - miniclusters/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - miniclusters/status - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - pods - verbs: - - create - - delete - - exec - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - secrets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - flux-framework.org - resources: - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create - - apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create - serviceAccountName: operator-controller-manager - deployments: - - label: - control-plane: controller-manager - name: operator-controller-manager - spec: - replicas: 1 - selector: - matchLabels: - control-plane: controller-manager - strategy: {} - template: - metadata: - annotations: - kubectl.kubernetes.io/default-container: manager - labels: - control-plane: controller-manager - spec: - containers: - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0 - name: kube-rbac-proxy - ports: - - containerPort: 8443 - name: https - protocol: TCP - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 5m - memory: 64Mi - securityContext: - allowPrivilegeEscalation: false - - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 - - --leader-elect - command: - - /manager - image: controller:latest - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - name: manager - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: - limits: - cpu: 500m - memory: 128Mi - requests: - cpu: 10m - memory: 64Mi - securityContext: - allowPrivilegeEscalation: false - securityContext: - runAsNonRoot: true - serviceAccountName: operator-controller-manager - terminationGracePeriodSeconds: 10 - permissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - serviceAccountName: operator-controller-manager - strategy: deployment - installModes: - - supported: false - type: OwnNamespace - - supported: false - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: true - type: AllNamespaces - keywords: - - flux - - manager - - batch - - jobs - - kubernetes - links: - - name: Operator - url: https://operator.domain - maintainers: - - email: vsoch@users.noreply.github.com - name: '@vsoch' - - email: zekemorton@users.noreply.github.com - name: '@zekemorton' - - email: milroy@users.noreply.github.com - name: '@milroy' - maturity: alpha - provider: - name: flux-framework - url: https://github.com/flux-framework/flux-operator - version: 0.0.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml deleted file mode 100644 index a02cb667..00000000 --- a/bundle/metadata/annotations.yaml +++ /dev/null @@ -1,14 +0,0 @@ -annotations: - # Core bundle annotations. - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: operator - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2 - operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 - - # Annotations for testing. - operators.operatorframework.io.test.mediatype.v1: scorecard+v1 - operators.operatorframework.io.test.config.v1: tests/scorecard/ diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml deleted file mode 100644 index 66430209..00000000 --- a/bundle/tests/scorecard/config.yaml +++ /dev/null @@ -1,70 +0,0 @@ -apiVersion: scorecard.operatorframework.io/v1alpha3 -kind: Configuration -metadata: - name: config -stages: -- parallel: true - tests: - - entrypoint: - - scorecard-test - - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: basic - test: basic-check-spec-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: olm - test: olm-bundle-validation-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: olm - test: olm-crds-have-validation-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: olm - test: olm-crds-have-resources-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: olm - test: olm-spec-descriptors-test - storage: - spec: - mountPath: {} - - entrypoint: - - scorecard-test - - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.22.2 - labels: - suite: olm - test: olm-status-descriptors-test - storage: - spec: - mountPath: {} -storage: - spec: - mountPath: {}