Skip to content

Commit 3ecf3e1

Browse files
authored
Update metadata, descriptors, rename resourceConstrains to resources, misc changes (#284)
Signed-off-by: leochr <leojc@ca.ibm.com>
1 parent deac6da commit 3ecf3e1

18 files changed

Lines changed: 430 additions & 395 deletions

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
2727

2828
LABEL vendor="Runtime Component Community" \
2929
name="Runtime Component Operator" \
30-
version="0.7.1" \
30+
version="0.8.0" \
3131
summary="Image for Runtime Component Operator" \
3232
description="This image contains the controller for Runtime Component Operator. See https://github.com/application-stacks/runtime-component-operator"
3333

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ PUBLISH_REGISTRY=docker.io
1515
BUNDLE_IMG ?= applicationstacks/operator:bundle-daily
1616

1717
# Options for 'bundle-build'
18+
CHANNELS ?= beta,beta2
19+
DEFAULT_CHANNEL ?= beta2
1820
ifneq ($(origin CHANNELS), undefined)
1921
BUNDLE_CHANNELS := --channels=$(CHANNELS)
2022
endif

api/v1beta2/runtimecomponent_types.go

Lines changed: 73 additions & 71 deletions
Large diffs are not rendered by default.

api/v1beta2/zz_generated.deepcopy.go

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bundle.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=runtime-component
8-
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
8+
LABEL operators.operatorframework.io.bundle.channels.v1=beta,beta2
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1=beta2
910
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1011
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.6.1+git
1112
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

bundle/manifests/rc.app.stacks_runtimecomponents.yaml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
description: Defines the desired state of RuntimeComponent.
6666
properties:
6767
affinity:
68-
description: Configures a Pod to run on particular Nodes.
68+
description: Configure pods to run on particular Nodes.
6969
properties:
7070
architecture:
7171
description: An array of architectures to be considered for deployment. Their position in the array indicates preference.
@@ -417,18 +417,19 @@ spec:
417417
type: object
418418
type: object
419419
applicationImage:
420-
description: Application image to be installed.
420+
description: Application image to deploy.
421421
type: string
422422
applicationName:
423-
description: The name of the application this resource is part of. If not specified, it defaults to the name of the CR.
423+
description: Name of the application. Defaults to the name of this custom resource.
424424
type: string
425425
applicationVersion:
426+
description: Version of the application.
426427
type: string
427428
autoscaling:
428429
description: Configures the desired resource consumption of pods.
429430
properties:
430431
maxReplicas:
431-
description: Required field for autoscaling. Upper limit for the number of pods that can be set by the autoscaler. Parameter spec.resourceConstraints.requests.cpu must also be specified.
432+
description: Required field for autoscaling. Upper limit for the number of pods that can be set by the autoscaler. Parameter .spec.resources.requests.cpu must also be specified.
432433
format: int32
433434
minimum: 1
434435
type: integer
@@ -437,12 +438,12 @@ spec:
437438
format: int32
438439
type: integer
439440
targetCPUUtilizationPercentage:
440-
description: Target average CPU utilization (represented as a percentage of requested CPU) over all the pods.
441+
description: Target average CPU utilization, represented as a percentage of requested CPU, over all the pods.
441442
format: int32
442443
type: integer
443444
type: object
444445
createKnativeService:
445-
description: A boolean to toggle the creation of Knative resources and usage of Knative serving.
446+
description: Create Knative resources and use Knative serving.
446447
type: boolean
447448
deployment:
448449
description: Defines the desired state and cycle of applications.
@@ -477,7 +478,7 @@ spec:
477478
type: object
478479
type: object
479480
env:
480-
description: An array of environment variables following the format of {name, value}, where value is a simple string.
481+
description: An array of environment variables for the application container.
481482
items:
482483
description: EnvVar represents an environment variable present in a Container.
483484
properties:
@@ -560,7 +561,7 @@ spec:
560561
- name
561562
x-kubernetes-list-type: map
562563
envFrom:
563-
description: An array of references to ConfigMap or Secret resources containing environment variables.
564+
description: List of sources to populate environment variables in the application container.
564565
items:
565566
description: EnvFromSource represents the source of a set of ConfigMaps
566567
properties:
@@ -591,10 +592,10 @@ spec:
591592
type: array
592593
x-kubernetes-list-type: atomic
593594
expose:
594-
description: A boolean that toggles the external exposure of this deployment via a Route or a Knative Route resource.
595+
description: Expose the application externally via a Route, a Knative Route or an Ingress resource.
595596
type: boolean
596597
initContainers:
597-
description: List of containers that run before other containers in a pod.
598+
description: List of containers to run before other containers in a pod.
598599
items:
599600
description: A single application container that you want to run within a pod.
600601
properties:
@@ -1858,11 +1859,11 @@ spec:
18581859
description: Name of the Secret to use to pull images from the specified repository. It is not required if the cluster is configured with a global image pull secret.
18591860
type: string
18601861
replicas:
1861-
description: Number of pods to create.
1862+
description: Number of pods to create. Not applicable when .spec.autoscaling or .spec.createKnativeService is specified.
18621863
format: int32
18631864
type: integer
1864-
resourceConstraints:
1865-
description: Limits the amount of required resources.
1865+
resources:
1866+
description: Resource requests and limits for the application container.
18661867
properties:
18671868
limits:
18681869
additionalProperties:
@@ -1983,10 +1984,10 @@ spec:
19831984
type: string
19841985
type: object
19851986
serviceAccountName:
1986-
description: The name of the OpenShift service account to be used during deployment.
1987+
description: Name of the service account to use for deploying the application. A service account is automatically created if it's not specified.
19871988
type: string
19881989
sidecarContainers:
1989-
description: The list of sidecar containers. These are additional containers to be added to the pods.
1990+
description: List of sidecar containers. These are additional containers to be added to the pods.
19901991
items:
19911992
description: A single application container that you want to run within a pod.
19921993
properties:
@@ -2916,7 +2917,7 @@ spec:
29162917
type: object
29172918
type: object
29182919
volumeMounts:
2919-
description: Represents where to mount the volumes into containers.
2920+
description: Represents where to mount the volumes into the application container.
29202921
items:
29212922
description: VolumeMount describes a mounting of a Volume within a container.
29222923
properties:
@@ -2945,7 +2946,7 @@ spec:
29452946
type: array
29462947
x-kubernetes-list-type: atomic
29472948
volumes:
2948-
description: Represents a pod volume with data that is accessible to the containers.
2949+
description: Represents a volume with data that is accessible to the application container.
29492950
items:
29502951
description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
29512952
properties:

0 commit comments

Comments
 (0)