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.

Sign up for GitHub

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

Jump to bottom

Add option to select keda release to KedaController CRD #217

Closed
wants to merge 9 commits into from
Closed

Add option to select keda release to KedaController CRD #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a03a9f0
Add option to select keda release to KedaController CRD
josefkarasek Feb 19, 2024
f9cc8da
validate input: keda semantic version
josefkarasek Feb 20, 2024
f51753e
include tests
josefkarasek Feb 20, 2024
63fe11c
fix test
josefkarasek Feb 20, 2024
abae737
fix test & update dockerfile
josefkarasek Feb 21, 2024
d86543a
fix test
josefkarasek Feb 21, 2024
ac1d3de
fix version
josefkarasek Feb 21, 2024
78f952a
revert go change
josefkarasek Feb 21, 2024
c49879b
fix lint issue
josefkarasek Feb 21, 2024
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
2 changes: 2 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ RUN VERSION=${BUILD_VERSION} GIT_COMMIT=${GIT_COMMIT} GIT_VERSION=${GIT_VERSION}
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /workspace/resources/keda.yaml /workspace/resources/${BUILD_VERSION}/keda.yaml
COPY --from=builder /workspace/resources/keda-olm-operator.yaml /workspace/resources/${BUILD_VERSION}/keda-olm-operator.yaml
COPY --from=builder /workspace/resources/keda.yaml /workspace/resources/keda.yaml
COPY --from=builder /workspace/resources/keda-olm-operator.yaml /workspace/resources/keda-olm-operator.yaml
COPY --from=builder /workspace/bin/manager .
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ spec:
# with Name set to 'keda' created in namespace where the operator is installed (usually 'keda')
###

# select KEDA release to install
# from keda-olm-operator release 2.12.2 onwards, three latest KEDA releases are supported
# kedaRelease: "" # default value is empty, which means the latest KEDA release will be installed
# kedaRelease: "2.12.1"

## Namespace that should be watched by KEDA,
# omit or set empty to watch all namespaces (default setting)
watchNamespace: ""
Expand Down
5 changes: 3 additions & 2 deletions apis/keda/v1alpha1/kedacontroller_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const (
// +kubebuilder:subresource:status
type KedaControllerSpec struct {

// +optional
KedaRelease string `json:"kedaRelease,omitempty"`

// +optional
WatchNamespace string `json:"watchNamespace,omitempty"`

Expand Down Expand Up @@ -206,8 +209,6 @@ type KedaControllerStatus struct {
ConfigMapDataSum string `json:"configmapdatasum,omitempty"`
// +optional
SecretDataSum string `json:"secretdatasum,omitempty"`

// Important: Run "make" to regenerate code after modifying this file
}

// +kubebuilder:object:root=true
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/keda.sh_kedacontrollers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ spec:
type: object
type: array
type: object
kedaRelease:
type: string
metricsServer:
properties:
affinity:
Expand Down
5 changes: 5 additions & 0 deletions config/samples/keda_v1alpha1_kedacontroller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ spec:
# with Name set to 'keda' created in namespace 'keda'
###

# select KEDA release to install
# from keda-olm-operator release 2.12.2 onwards, three latest KEDA releases are supported
# kedaRelease: "" # default value is empty, which means the latest KEDA release will be installed
# kedaRelease: "2.12.1"

## Namespace that should be watched by KEDA,
# omit or set empty to watch all namespaces (default setting)
watchNamespace: ""
Expand Down
Loading
Loading