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

chore: add skaffold config for multi gw enterprise #6145

Merged
merged 1 commit into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions config/base/kong-ingress-dbless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ spec:
- name: cmetrics
containerPort: 10255
protocol: TCP
- name: diagnostics
containerPort: 10256
protocol: TCP
livenessProbe:
httpGet:
path: /healthz
Expand Down
5 changes: 5 additions & 0 deletions config/components/manager_dev_patch/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

patches:
- path: manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ spec:
spec:
containers:
- name: ingress-controller
args:
- --feature-gates=GatewayAlpha=true,KongServiceFacade=true
- --anonymous-reports=false
env:
- name: CONTROLLER_DUMP_CONFIG
value: "true"
- name: CONTROLLER_LOG_LEVEL
value: debug
- name: CONTROLLER_FEATURE_GATES
value: GatewayAlpha=true,KongServiceFacade=true,FallbackConfiguration=true
- name: CONTROLLER_ANONYMOUS_REPORTS
value: "false"
image: kic-placeholder:placeholder
4 changes: 2 additions & 2 deletions config/image/enterprise/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: Component
images:
- name: kong
newName: kong/kong-gateway
newTag: '3.5'
newTag: '3.7' # renovate: datasource=docker versioning=docker depName=kong/kong-gateway
- name: kong-placeholder
newName: kong/kong-gateway
newTag: '3.5'
newTag: '3.7' # renovate: datasource=docker versioning=docker depName=kong/kong-gateway
4 changes: 2 additions & 2 deletions config/image/oss/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Component
images:
- name: kong-placeholder
newName: kong
newTag: '3.7'
newTag: '3.7' # renovate: datasource=docker versioning=docker depName=kong
- name: kic-placeholder
newName: kong/kubernetes-ingress-controller
newTag: '3.1'
newTag: '3.1' # renovate: datasource=docker versioning=docker depName=kong/kubernetes-ingress-controller
4 changes: 1 addition & 3 deletions config/variants/multi-gw/dev/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ resources:

components:
- ../../../components/manager_dev_webhook

patches:
- path: manager.yaml
- ../../../components/manager_dev_patch
14 changes: 14 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,20 @@
"addLabels": [
"renovate/auto-regenerate"
]
},
{
"description": "Match versions in config/image/oss and config/image/enterprise kustomize files that are properly annotated with `# renovate: datasource={} versioning={} depName={}`.",
"customType": "regex",
"fileMatch": [
"^config/image/enterprise/.*\\.yaml$",
"^config/image/oss/.*\\.yaml$"
],
"matchStrings": [
"'(?<currentValue>.+)' # renovate: datasource=(?<datasource>.*) versioning=(?<versioning>.*) depName=(?<depName>.+)"
],
"addLabels": [
"renovate/auto-regenerate"
]
}
]
}
16 changes: 16 additions & 0 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,22 @@ profiles:
COMMIT: ${{ .COMMIT }}
REPO_INFO: ${{ .REPO_INFO }}
GOCACHE: "{{ .GOCACHE }}"
- name: multi_gw_enterprise
manifests:
kustomize:
paths:
- config/variants/multi-gw/enterprise
build:
artifacts:
- image: kic-placeholder
docker:
dockerfile: Dockerfile
target: distroless
buildArgs:
TAG: ${{ .TAG }}
COMMIT: ${{ .COMMIT }}
REPO_INFO: ${{ .REPO_INFO }}
GOCACHE: "{{ .GOCACHE }}"
- name: multi_gw_postgres
manifests:
kustomize:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions test/e2e/manifests/all-in-one-dbless-konnect.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions test/e2e/manifests/all-in-one-dbless.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions test/e2e/manifests/all-in-one-postgres-enterprise.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions test/e2e/manifests/all-in-one-postgres.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading