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.

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

fix: Rename keda-http-add-on-interceptor-proxy to keda-add-ons-http-interceptor-proxy #1037

Merged
merged 2 commits into from
Feb 21, 2025
Merged
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
@@ -75,9 +75,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/kedacore/http-add-on/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-http-add-on-${{ steps.get_version.outputs.VERSION }}.yaml
asset_path: keda-http-add-on-${{ steps.get_version.outputs.VERSION }}.yaml
asset_name: keda-http-add-on-${{ steps.get_version.outputs.VERSION }}.yaml
upload_url: https://uploads.github.com/repos/kedacore/http-add-on/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}.yaml
asset_path: keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}.yaml
asset_name: keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}.yaml
asset_content_type: application/x-yaml

# Upload CRD deployment YAML file to GitHub release
@@ -87,7 +87,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/kedacore/http-add-on/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-http-add-on-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_path: keda-http-add-on-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_name: keda-http-add-on-${{ steps.get_version.outputs.VERSION }}-crds.yaml
upload_url: https://uploads.github.com/repos/kedacore/http-add-on/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_path: keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_name: keda-add-ons-http-${{ steps.get_version.outputs.VERSION }}-crds.yaml
asset_content_type: application/x-yaml
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -128,15 +128,15 @@ publish-scaler-multiarch:

publish-multiarch: publish-operator-multiarch publish-interceptor-multiarch publish-scaler-multiarch

release: manifests kustomize ## Produce new KEDA Http Add-on release in keda-http-add-on-$(VERSION).yaml file.
release: manifests kustomize ## Produce new KEDA Http Add-on release in keda-add-ons-http-$(VERSION).yaml file.
cd config/interceptor && \
$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-interceptor=${IMAGE_INTERCEPTOR_VERSIONED_TAG}
cd config/scaler && \
$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-scaler=${IMAGE_SCALER_VERSIONED_TAG}
cd config/operator && \
$(KUSTOMIZE) edit set image ghcr.io/kedacore/http-add-on-operator=${IMAGE_OPERATOR_VERSIONED_TAG}
$(KUSTOMIZE) build config/default > keda-http-add-on-$(VERSION).yaml
$(KUSTOMIZE) build config/crd > keda-http-add-on-$(VERSION)-crds.yaml
$(KUSTOMIZE) build config/default > keda-add-ons-http-$(VERSION).yaml
$(KUSTOMIZE) build config/crd > keda-add-ons-http-$(VERSION)-crds.yaml

# Development

2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ resources:
- ../operator
- ../scaler
namespace: keda
namePrefix: keda-http-add-on-
namePrefix: keda-add-ons-http-
labels:
- includeSelectors: true
includeTemplates: true
2 changes: 1 addition & 1 deletion config/operator/deployment.yaml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ spec:
- --zap-time-encoding=rfc3339
env:
- name: KEDAHTTP_OPERATOR_EXTERNAL_SCALER_SERVICE
value: "keda-http-add-on-external-scaler"
value: "keda-add-ons-http-external-scaler"
- name: KEDAHTTP_OPERATOR_EXTERNAL_SCALER_PORT
value: "9090"
- name: KEDA_HTTP_OPERATOR_NAMESPACE
4 changes: 2 additions & 2 deletions config/scaler/deployment.yaml
Original file line number Diff line number Diff line change
@@ -29,13 +29,13 @@ spec:
- --zap-time-encoding=rfc3339
env:
- name: KEDA_HTTP_SCALER_TARGET_ADMIN_DEPLOYMENT
value: "keda-http-add-on-interceptor"
value: "keda-add-ons-http-interceptor"
- name: KEDA_HTTP_SCALER_PORT
value: "9090"
- name: KEDA_HTTP_SCALER_TARGET_ADMIN_NAMESPACE
value: "keda"
- name: KEDA_HTTP_SCALER_TARGET_ADMIN_SERVICE
value: "keda-http-add-on-interceptor-admin"
value: "keda-add-ons-http-interceptor-admin"
- name: KEDA_HTTP_SCALER_TARGET_ADMIN_PORT
value: "9090"
- name: KEDA_HTTP_SCALER_STREAM_INTERVAL_MS
2 changes: 0 additions & 2 deletions docs/walkthrough.md
Original file line number Diff line number Diff line change
@@ -53,8 +53,6 @@ As said above, you need to route your HTTP traffic to the `Service` that the add
keda-add-ons-http-interceptor-proxy
```

> This is installed by raw manifests. If you are using the [Helm chart](https://github.com/kedacore/charts/tree/main/http-add-on) to install the add-on, it crates a service named `keda-add-ons-http-interceptor-proxy` as a `ClusterIP` by default.

#### Installing and Using the [ingress-nginx](https://kubernetes.github.io/ingress-nginx/deploy/#using-helm) Ingress Controller

As mentioned above, the `Service` that the add-on creates will be inaccessible over the network from outside of your Kubernetes cluster.
2 changes: 1 addition & 1 deletion examples/xkcd/templates/externalservice.yaml
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ metadata:
{{- include "xkcd.labels" . | nindent 4 }}
spec:
type: ExternalName
externalName: keda-http-add-on-interceptor-proxy.keda
externalName: keda-add-ons-http-interceptor-proxy.keda
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ spec:
rules:
- backendRefs:
- kind: Service
name: keda-http-add-on-interceptor-proxy
name: keda-add-ons-http-interceptor-proxy
namespace: keda
port: 8080
matches:
@@ -86,7 +86,7 @@ spec:
to:
- group: ""
kind: Service
name: keda-http-add-on-interceptor-proxy
name: keda-add-ons-http-interceptor-proxy
`
serviceTemplate = `
apiVersion: v1
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ metadata:
app: {{.DeploymentName}}
spec:
type: ExternalName
externalName: keda-http-add-on-interceptor-proxy.{{.KEDANamespace}}
externalName: keda-add-ons-http-interceptor-proxy.{{.KEDANamespace}}
`

serviceTemplate = `
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ spec:
pathType: Prefix
backend:
service:
name: keda-http-add-on-interceptor-proxy
name: keda-add-ons-http-interceptor-proxy
port:
number: 8080
`
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ var (
host = testName
minReplicaCount = 0
maxReplicaCount = 1
kedaInterceptorPrometheusURL = "http://keda-http-add-on-interceptor-metrics.keda:2223/metrics"
kedaInterceptorPrometheusURL = "http://keda-add-ons-http-interceptor-metrics.keda:2223/metrics"
)

type templateData struct {
@@ -108,7 +108,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import (

const (
kedaNamespace = "keda"
interceptorScaledObjectName = "keda-http-add-on-interceptor"
interceptorScaledObjectName = "keda-add-ons-http-interceptor"
scaledObject = "scaledobject"
)

2 changes: 1 addition & 1 deletion tests/checks/interceptor_tls/interceptor_tls_test.go
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ func TestInterceptorTLS(t *testing.T) {
func sendRequest(t *testing.T) {
t.Log("--- sending request ---")

stdout, _, err := ExecCommandOnSpecificPod(t, clientName, testNamespace, fmt.Sprintf("curl -k -H 'Host: %s' https://keda-http-add-on-interceptor-proxy.keda:8443/echo?msg=tls_test", host))
stdout, _, err := ExecCommandOnSpecificPod(t, clientName, testNamespace, fmt.Sprintf("curl -k -H 'Host: %s' https://keda-add-ons-http-interceptor-proxy.keda:8443/echo?msg=tls_test", host))
require.NoErrorf(t, err, "could not run command on test client pod - %s", err)

assert.Equal(t, "tls_test", stdout, fmt.Sprintf("incorrect response body from test request: expected %s, got %s", "tls_test", stdout))
2 changes: 1 addition & 1 deletion tests/checks/internal_service/internal_service_test.go
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
2 changes: 1 addition & 1 deletion tests/checks/multiple_hosts/multiple_hosts_test.go
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
2 changes: 1 addition & 1 deletion tests/checks/path_prefix/path_prefix_test.go
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ spec:
- name: curl-client
image: curlimages/curl
imagePullPolicy: Always
command: ["curl", "-H", "Host: {{.Host}}", "keda-http-add-on-interceptor-proxy.keda:8080{{.PathPrefix}}"]
command: ["curl", "-H", "Host: {{.Host}}", "keda-add-ons-http-interceptor-proxy.keda:8080{{.PathPrefix}}"]
restartPolicy: Never
activeDeadlineSeconds: 600
backoffLimit: 5
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ spec:
- "1"
- "-H"
- "Host: {{.Host}}"
- "http://keda-http-add-on-interceptor-proxy.keda:8080/"
- "http://keda-add-ons-http-interceptor-proxy.keda:8080/"
restartPolicy: Never
terminationGracePeriodSeconds: 5
activeDeadlineSeconds: 600
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ spec:
- "1"
- "-H"
- "Host: {{.Host}}"
- "http://keda-http-add-on-interceptor-proxy.keda:8080/"
- "http://keda-add-ons-http-interceptor-proxy.keda:8080/"
restartPolicy: Never
terminationGracePeriodSeconds: 5
activeDeadlineSeconds: 600
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ spec:
- "1"
- "-H"
- "Host: {{.Host}}"
- "http://keda-http-add-on-interceptor-proxy.keda:8080/"
- "http://keda-add-ons-http-interceptor-proxy.keda:8080/"
restartPolicy: Never
terminationGracePeriodSeconds: 5
activeDeadlineSeconds: 600
@@ -162,7 +162,7 @@ spec:
- type: external-push
metadata:
httpScaledObject: {{.HTTPScaledObjectName}}
scalerAddress: keda-http-add-on-external-scaler.keda:9090
scalerAddress: keda-add-ons-http-external-scaler.keda:9090
`
)

Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ spec:
- "1"
- "-H"
- "Host: {{.Host}}"
- "http://keda-http-add-on-interceptor-proxy.keda:8080/"
- "http://keda-add-ons-http-interceptor-proxy.keda:8080/"
restartPolicy: Never
terminationGracePeriodSeconds: 5
activeDeadlineSeconds: 600