Skip to content

Commit

Permalink
Merge pull request #7 from dysnix/main
Browse files Browse the repository at this point in the history
Update from upstream
  • Loading branch information
daniel-yavorovich authored Jan 17, 2022
2 parents 50c49ca + dad3bfc commit 4e0bb8d
Show file tree
Hide file tree
Showing 17 changed files with 1,246 additions and 87 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/3_bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ body:
label: Kubernetes Version
description: What version of Kubernetes that are you running?
options:
- "1.23"
- "1.22"
- "1.21"
- "1.20"
Expand Down
110 changes: 110 additions & 0 deletions .github/assets/test-upgrade-manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
# Namespace
apiVersion: v1
kind: Namespace
metadata:
name: upgrade-test
---
# ScaledObject
apiVersion: apps/v1
kind: Deployment
metadata:
name: scaledobject-workload
namespace: upgrade-test
spec:
replicas: 1
selector:
matchLabels:
app: scaledobject-workload
strategy: {}
template:
metadata:
labels:
app: scaledobject-workload
spec:
containers:
- image: nginx
name: scaledobject-workload
resources:
requests:
memory: "64Mi"
cpu: "25m"
limits:
memory: "128Mi"
cpu: "50m"
---
apiVersion: keda.sh/v1alpha1
kind: ScaledObject
metadata:
name: scaledobject-autoscaling
namespace: upgrade-test
spec:
scaleTargetRef:
name: scaledobject-workload
pollingInterval: 30
cooldownPeriod: 300
idleReplicaCount: 0
minReplicaCount: 1
maxReplicaCount: 100
fallback:
failureThreshold: 3
replicas: 5
advanced:
restoreToOriginalReplicaCount: true
horizontalPodAutoscalerConfig:
behavior:
scaleDown:
stabilizationWindowSeconds: 300
policies:
- type: Percent
value: 100
periodSeconds: 15
triggers:
- type: cron
metadata:
timezone: Asia/Kolkata
start: 0 7 * * *
end: 59 6 * * *
desiredReplicas: "3"
---
#ScaledJob
apiVersion: keda.sh/v1alpha1
kind: ScaledJob
metadata:
name: scaledjob-autoscaling
namespace: upgrade-test
spec:
jobTargetRef:
parallelism: 1
completions: 1
activeDeadlineSeconds: 600
backoffLimit: 6
template:
spec:
containers:
- image: busybox
name: test
command: ["/bin/sh"]
args: ["-c", "echo hello"]
restartPolicy: Never
pollingInterval: 30
successfulJobsHistoryLimit: 5
failedJobsHistoryLimit: 5
envSourceContainerName: test
maxReplicaCount: 100
rolloutStrategy: gradual
scalingStrategy:
strategy: "custom"
customScalingQueueLengthDeduction: 1
customScalingRunningJobPercentage: "0.5"
pendingPodConditions:
- "Ready"
- "PodScheduled"
- "AnyOtherCustomPodCondition"
multipleScalersCalculation : "max"
triggers:
- type: cron
metadata:
timezone: Asia/Kolkata
start: 0 7 * * *
end: 59 6 * * *
desiredReplicas: "3"
7 changes: 5 additions & 2 deletions .github/workflows/pr-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@ jobs:
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
# Username used to log in to a Docker registry. If not set then no login will occur
username: ${{ github.repository_owner }}
# Password or personal access token used to log in to a Docker registry. If not set then no login will occur
password: ${{ secrets.GHCR_AUTH_PAT }}
# Server address of Docker registry. If not set then will default to Docker Hub
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Publish on GitHub Container Registry
run: make publish
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
default_stages: [commit, push]
minimum_pre_commit_version: "1.20.0"
repos:
- repo: git://github.com/dnephin/pre-commit-golang
- repo: https://github.com/dnephin/pre-commit-golang
rev: v0.3.5
hooks:
- id: go-fmt
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

- Add New Relic Scaler ([#2387](https://github.com/kedacore/keda/pull/2387))
- Add ActiveMQ Scaler ([#2305](https://github.com/kedacore/keda/pull/2305))
- Add New Datadog Scaler ([#2354](https://github.com/kedacore/keda/pull/2354))
- Add PredictKube Scaler ([#2418](https://github.com/kedacore/keda/pull/2418))

### Improvements
Expand All @@ -38,6 +39,8 @@
- **PostgreSQL Scaler:** Assign PostgreSQL `userName` to correct attribute ([#2432](https://github.com/kedacore/keda/pull/2432))|([#2433](https://github.com/kedacore/keda/pull/2433))
- **Kafka Scaler:** concurrently query brokers for consumer and producer offsets ([#2405](https://github.com/kedacore/keda/pull/2405))
- **External Scaler:** fix wrong calculation of retry backoff duration ([#2416](https://github.com/kedacore/keda/pull/2416))
- **Kafka Scaler:** allow flag `topic` to be optional, where lag of all topics within the consumer group will be used for scaling ([#2409](https://github.com/kedacore/keda/pull/2409))
- **CPU Scaler:** Adding e2e test for the cpu scaler ([#2441](https://github.com/kedacore/keda/pull/2441))

### Breaking Changes

Expand Down
20 changes: 17 additions & 3 deletions RELEASE-PROCESS.MD
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ Creating a new release in the releases page (https://github.com/kedacore/keda/re

KEDA Deployment YAML file (eg. keda-2.4.0.yaml) is also automatically created and attached to the Release as part of the workflow.

> Note: The Docker Hub repo with all the different images can be seen here: https://hub.docker.com/r/kedacore/keda/tags
> Note: The container registry repo with all the different images can be seen [here](https://github.com/orgs/kedacore/packages?repo_name=keda)
### Release template

Every release should use the following template to create the GitHub release.
Every release should use the provided template below to create the GitHub release and ensure that a new GitHub Discussion is created.

> 💡 Don't forget to update the version in the template
> 💡 Don't forget to update the version & new contributors in the template
Here's the template:

Expand Down Expand Up @@ -63,8 +63,22 @@ Learn how to deploy KEDA by reading [our documentation](https://keda.sh/docs/INS
### Other

- <list items>

### New Contributors

<generated new contributors info>
```

### Generating new contributor's info

In order to generate a list of new contributors, use the `Auto-generate release notes` GitHub feature of the release.

<details>
<summary>Screenshot</summary>

![image](https://user-images.githubusercontent.com/4345663/148563945-ad75816d-739b-4e8d-a063-aa0e77f6e98d.png)
</details>

## 5. Setup continous container scanning with Snyk

In order to continuously scan our new container image, they must be imported in our [Snyk project](https://app.snyk.io/org/keda/projects) for all newly introduced tags.
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ require (
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd
github.com/Azure/go-autorest/autorest v0.11.22
github.com/Azure/go-autorest/autorest/azure/auth v0.5.9
github.com/DataDog/datadog-api-client-go v1.6.0 // indirect
github.com/Huawei/gophercloud v1.0.21
github.com/Shopify/sarama v1.30.0
github.com/aws/aws-sdk-go v1.42.16
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DataDog/datadog-api-client-go v1.6.0 h1:ccMzM4vw37/8ww9VKKydWMrI+xEs0uE13O5mkG9Ny/8=
github.com/DataDog/datadog-api-client-go v1.6.0/go.mod h1:QzaQF1cDO1/BIQG1fz14VrY+6RECUGkiwzDCtVbfP5c=
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/Huawei/gophercloud v1.0.21 h1:HhtzZzRGZiVmLypqHlXrGAcdC1TJW99FLewfPSVktpY=
github.com/Huawei/gophercloud v1.0.21/go.mod h1:TUtAO2PE+Nj7/QdfUXbhi5Xu0uFKVccyukPA7UCxD9w=
Expand Down
Loading

0 comments on commit 4e0bb8d

Please sign in to comment.