Fixing merge conflict for target-metric_crd

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -8,10 +8,8 @@ A clear and concise description of what the bug is.
 
 ## Expected Behavior
 
-
 ## Actual Behavior
 
-
 ## Steps to Reproduce the Problem
 
   1.
@@ -20,7 +18,7 @@ A clear and concise description of what the bug is.
 
 ## Specifications
 
-  - **KEDA Version:** *Please elaborate*
-  - **Platform & Version:** *Please elaborate*
-  - **Kubernetes Version:** *Please elaborate*
-  - **Scaler(s):** *Please elaborate*
+- **KEDA Version:** *Please elaborate*
+- **KEDA HTTP Add-on Version:** *Please elaborate*
+- **Platform & Version:** *Please elaborate*
+- **Kubernetes Version:** *Please elaborate*

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -12,4 +12,4 @@ Tell us more what you'd like to achieve
 
 ### Specification
 
-- [ ] Demand #1
+Tell us in detail how this feature should work

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!-- Thank you for contributing!
 
      Read more about how you can contribute in our contribution guide:
-     https://github.com/kedacore/keda/blob/master/CONTRIBUTING.md
+     https://github.com/kedacore/http-add-on/blob/main/CONTRIBUTING.md
 -->
 
 _Provide a description of what has been changed_
@@ -11,7 +11,7 @@ _Provide a description of what has been changed_
 - [ ] Commits are signed with Developer Certificate of Origin (DCO)
 - [ ] Any necessary documentation is added, such as:
   - [`README.md`](/README.md)
-  - [`docs/`](./docs)
+  - [The `docs/` directory](./docs)
   - [The docs repo](https://github.com/kedacore/keda-docs)
 
 Fixes #

.github/workflows/build_release.yml

@@ -21,6 +21,11 @@ jobs:
         id: prep
         run: |
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      
+      - name: Get the version
+        id: get_version
+        run: |
+          echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
 
       - name: Set up Buildx
         uses: docker/setup-buildx-action@v1
@@ -39,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           # Docker repository to tag the image with
-          tags: ${{ env.IMAGE_OPERATOR_NAME }}:latest,${{ env.IMAGE_OPERATOR_NAME }}:${GITHUB_REF#refs/tags/}
+          tags: ${{ env.IMAGE_OPERATOR_NAME }}:latest,${{ env.IMAGE_OPERATOR_NAME }}:${{ steps.get_version.outputs.VERSION }}
           labels: |
             sh.keda.http.image.source=${{github.event.repository.html_url}}
             sh.keda.http.image.created=${{steps.prep.outputs.created}}
@@ -78,7 +83,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           # Docker repository to tag the image with
-          tags: ${{ env.IMAGE_INTERCEPTOR_NAME }}:latest,${{ env.IMAGE_INTERCEPTOR_NAME }}:${GITHUB_REF#refs/tags/}
+          tags: ${{ env.IMAGE_INTERCEPTOR_NAME }}:latest,${{ env.IMAGE_INTERCEPTOR_NAME }}:${{ steps.get_version.outputs.VERSION }}
           labels: |
             sh.keda.http.image.source=${{github.event.repository.html_url}}
             sh.keda.http.image.created=${{steps.prep.outputs.created}}
@@ -116,7 +121,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           # Docker repository to tag the image with
-          tags: ${{ env.IMAGE_SCALER_NAME }}:latest,${{ env.IMAGE_SCALER_NAME }}:${GITHUB_REF#refs/tags/}
+          tags: ${{ env.IMAGE_SCALER_NAME }}:latest,${{ env.IMAGE_SCALER_NAME }}:${{ steps.get_version.outputs.VERSION }}
           labels: |
             sh.keda.http.image.source=${{github.event.repository.html_url}}
             sh.keda.http.image.created=${{steps.prep.outputs.created}}

README.md

@@ -5,11 +5,9 @@
 
 The KEDA HTTP Add On allows Kubernetes users to automatically scale their HTTP servers up and down (including to/from zero) based on incoming HTTP traffic. Please see our [use cases document](./docs/use_cases.md) to learn more about how and why you would use this project.
 
-| 🚧 **Alpha - Not for production** 🚧|
+| 🚧 **Project status: beta** 🚧|
 |---------------------------------------------|
-| ⚠ The HTTP add-on is in [experimental stage](https://github.com/kedacore/keda/issues/538) and not ready for production. <br /><br />It is provided as-is without support.
-
->This codebase moves very quickly. We can't currently guarantee that any part of it will work. Neither the complete feature set nor known issues may be fully documented. Similarly, issues filed against this project may not be responded to quickly or at all. **We will release and announce a beta release of this project**, and after we do that, we will document and respond to issues properly.
+| ⚠ The HTTP add-on currently is in [beta](https://github.com/kedacore/http-add-on/releases/tag/v0.1.0). We can't yet recommend it for production usage because we are still developing and testing it. It may have "rough edges" including missing documentation, bugs and other issues. It is currently provided as-is without support.
 
 ## HTTP Autoscaling Made Simple
 
@@ -27,7 +25,7 @@ This project, often called KEDA-HTTP, exists to provide that scaling. It is comp
 
 ## Walkthrough
 
-Although this is an **alpha release** project right now, we have prepared a walkthrough document that with instructions on getting started for basic usage.
+Although this is currently a **beta release** project, we have prepared a walkthrough document that with instructions on getting started for basic usage.
 
 See that document at [docs/walkthrough.md](./docs/walkthrough.md)
 
@@ -46,8 +44,14 @@ Please see the [complete installation instructions](./docs/install.md).
 
 ## Contributing
 
-Please see the [contributing documentation for all instructions](./docs/contributing.md).
+This project follows the KEDA contributing guidelines, which are outlined in [CONTRIBUTING.md](https://github.com/kedacore/.github/blob/main/CONTRIBUTING.md).
+
+If you would like to contribute code to this project, please see [docs/developing.md](./docs/developing.md).
 
 ---
 We are a Cloud Native Computing Foundation (CNCF) sandbox project.
 <p align="center"><img src="https://raw.githubusercontent.com/kedacore/keda/main/images/logo-cncf.svg" height="75px"></p>
+
+## Code of Conduct
+
+Please refer to the organization-wide [Code of Conduct document](https://github.com/kedacore/.github/blob/main/CODE_OF_CONDUCT.md).

RELEASE-PROCESS.md

@@ -0,0 +1,43 @@
+# Release Process
+
+The process of releasing a new version of the KEDA HTTP Addon involves a few steps, detailed below.
+
+>The process herein is largely automated but we recognize that there may be more that we can automate. If you find something that _can_ and _should_ be automated, and you believe that you know how, please [submit an issue](https://github.com/kedacore/http-add-on/issues/new?assignees=&labels=needs-discussion%2Cfeature-request&template=Feature_request.md) explaining how.
+
+## 0: Current and new versions
+
+Please go to the [releases page](https://github.com/kedacore/http-add-on/releases) and observe what the most recent release is. Specifically, note what the _tag_ of the release is. For example, if [version 0.1.0](https://github.com/kedacore/http-add-on/releases/tag/v0.1.0) is the latest release (it is as the time of this writing), the tag for that is `v0.1.0`.
+
+To determine the new version, follow [SemVer guidelines](https://semver.org). Most releases will increment the PATCH or MINOR version number.
+
+## 1: Submit a PR to the [Helm Charts Repository](https://github.com/kedacore/charts)
+
+The scope of the changes you'll need to make to the Helm chart vary from just changing the `appVersion` field in the [Chart.yaml file](https://github.com/kedacore/charts/blob/master/http-add-on/Chart.yaml) to changing the `HTTPScaledObject` CRD, adding new configuration, or even adding/changing components.
+
+You must, at a minimum, change that `appVersion` field to the new version number, however. If you have chosen `1.2.3`, for example, the `appVersion` field should read:
+
+```yaml
+appVersion: 1.2.3
+```
+
+See the below steps for updating the Helm chart:
+
+1. Submit a Pull Request (PR) to the [github.com/kedacore/charts](https://github.com/kedacore/charts) repository with your changes. Also ensure that you follow the [Shipping a new version](https://github.com/kedacore/charts/blob/master/CONTRIBUTING.md#shipping-a-new-version) guidelines in the charts documentation to complete the chart release.
+   - Your chart changes must go into the [http-add-on](https://github.com/kedacore/charts/tree/master/http-add-on) directory. The release artifact will go into the [docs](https://github.com/kedacore/charts/tree/master/docs) directory.
+   - Ensure that you add a link to the HTTP Addon repository and the new release number, so that PR reviewers are aware what the work relates to
+2. Ensure that the Pull Request is reviewed and merged
+    - This may require collaboration with reviewers and appropriate changes
+
+## 2: Create a new GitHub release
+
+[Create a new release](https://github.com/kedacore/http-add-on/releases/new) on the GitHub releases page, using your new release number.
+
+The title of the release should be "Version 1.2.3", substituting `1.2.3` with the new version number, and the Git tag should be `v1.2.3`, again substituting `1.2.3` with your new version number.
+
+The release description should be a short to medium length summary of what has changed since the last release. The following link will give you a list of commits made since the `v0.1.0` tag: [github.com/kedacore/http-add-on/compare/v0.1.0...main](https://github.com/kedacore/http-add-on/compare/v0.1.0...main). Replace `v0.1.0` for your appropriate most recent last tag to get the commit list and base your release summary on that list.
+
+After you create the new release, automation in a GitHub action will build and deploy new container images.
+
+## 3: Write a blog post on the documentation site (_optional_)
+
+If you believe that your release is large enough to warrant a blog post on the [keda.sh/blog](https://keda.sh/blog/) site, please go to [github.com/kedacore/keda-docs](https://github.com/kedacore/keda-docs) and submit a new PR with a blog article about the release. Include in the article a longer summary of changes and any important information about the new functionality, bugfixes, or anything else appropriate. The post should go into the [content/blog](https://github.com/kedacore/keda-docs/tree/master/content/blog) directory.