Skip to content

Commit f6897e9

Browse files
airlockgithubciairlockgithubci
committed
CHG: Sync Artifacts - 4.6.0
1 parent 5de6413 commit f6897e9

File tree

98 files changed

+14747
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+14747
-358
lines changed

‎.github/workflows/dashboard-attach-action.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Attach Grafana Dashboard Release Artifact
2+
run-name: Attach Grafana Dashboards to Release ${{ github.event.release.tag_name }}
3+
on:
4+
release:
5+
types:
6+
- created
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
attach-dashboard-zip:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v4
18+
with:
19+
ref: ${{ github.event.release.tag_name }}
20+
21+
- name: Create ZIP file
22+
run: |
23+
mkdir -p artifacts
24+
zip -j artifacts/dashboards.zip deploy/charts/airlock-microgateway/dashboards/*.json
25+
26+
- name: Upload release artifact
27+
uses: actions/upload-release-asset@v1
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
with:
31+
upload_url: ${{ github.event.release.upload_url }}
32+
asset_path: artifacts/dashboards.zip
33+
asset_name: dashboards-${{ github.event.release.tag_name }}.zip
34+
asset_content_type: application/zip

‎README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ Modern application security is embedded in the development workflow and follows
2424

2525
For a list of all features, view the **[comparison of the community and premium edition](https://docs.airlock.com/microgateway/latest/?topic=MGW-00000056)**.
2626
## Labs
27-
We offer a growing number of [Airlock Microgateway labs](https://play.instruqt.com/airlock/invite/hyi9fy4b4jzc?icp_referrer=github.com) that are designed to be easy-to-follow tutorials. All labs are fully guided and cover aspects of Airlock Microgateway from installation to configuration in a preconfigured cloud-based Kubernetes environment.
27+
We offer a growing number of [Airlock Microgateway labs](https://airlock.instruqt.com/pages/airlock-microgateway-labs) that are designed to be easy-to-follow tutorials. All labs are fully guided and cover aspects of Airlock Microgateway from installation to configuration in a preconfigured cloud-based Kubernetes environment.
2828

29-
[![Airlock Microgateway labs](https://raw.githubusercontent.com/airlock/microgateway/main/media/airlock-microgateway-instruqt-tracks.gif)](https://play.instruqt.com/airlock/invite/hyi9fy4b4jzc?icp_referrer=github.com)
29+
[![Airlock Microgateway labs](https://raw.githubusercontent.com/airlock/microgateway/main/media/airlock-microgateway-instruqt-tracks.gif)](https://airlock.instruqt.com/pages/airlock-microgateway-labs)
3030

3131
Learn the basics and expand existing knowledge without any administration effort in a secure environment.
3232

@@ -61,7 +61,7 @@ For an easy start in non-production environments, you may deploy the same cert-m
6161
### Deploy cert-manager
6262
```console
6363
helm repo add jetstack https://charts.jetstack.io
64-
helm install cert-manager jetstack/cert-manager --version 'v1.16.3' -n cert-manager --create-namespace --set crds.enabled=true --wait
64+
helm install cert-manager jetstack/cert-manager --version 'v1.17.2' -n cert-manager --create-namespace --set crds.enabled=true --wait
6565
```
6666

6767
## (Recommended) Deploy Airlock Microgateway CNI
@@ -72,33 +72,33 @@ helm install cert-manager jetstack/cert-manager --version 'v1.16.3' -n cert-mana
7272
> **Note**: Certain environments such as OpenShift or GKE require non-default configurations when installing the CNI plugin. For the most common setups, values files are provided in the [chart folder](/deploy/charts/airlock-microgateway-cni).
7373
```console
7474
# Standard setup
75-
helm install airlock-microgateway-cni -n kube-system oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3'
75+
helm install airlock-microgateway-cni -n kube-system oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0'
7676
kubectl -n kube-system rollout status daemonset -l app.kubernetes.io/instance=airlock-microgateway-cni
7777
```
7878
```console
7979
# GKE setup
80-
helm install airlock-microgateway-cni -n kube-system oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3' -f https://raw.githubusercontent.com/airlock/microgateway/4.5.3/deploy/charts/airlock-microgateway-cni/gke-values.yaml
80+
helm install airlock-microgateway-cni -n kube-system oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0' -f https://raw.githubusercontent.com/airlock/microgateway/4.6.0/deploy/charts/airlock-microgateway-cni/gke-values.yaml
8181
kubectl -n kube-system rollout status daemonset -l app.kubernetes.io/instance=airlock-microgateway-cni
8282
```
8383
```console
8484
# OpenShift setup
85-
helm install airlock-microgateway-cni -n openshift-operators oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3' -f https://raw.githubusercontent.com/airlock/microgateway/4.5.3/deploy/charts/airlock-microgateway-cni/openshift-values.yaml
85+
helm install airlock-microgateway-cni -n openshift-operators oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0' -f https://raw.githubusercontent.com/airlock/microgateway/4.6.0/deploy/charts/airlock-microgateway-cni/openshift-values.yaml
8686
kubectl -n openshift-operators rollout status daemonset -l app.kubernetes.io/instance=airlock-microgateway-cni
8787
```
8888
> **Important:** On OpenShift, all pods which should be protected by Airlock Microgateway must explicitly reference the Airlock Microgateway CNI NetworkAttachmentDefinition via the annotation `k8s.v1.cni.cncf.io/networks` (see [documentation](https://docs.airlock.com/microgateway/latest/?topic=MGW-00000140) for details).
8989
9090
2. (Recommended) You can verify the correctness of the installation with `helm test`.
9191
```console
9292
# Standard and GKE setup
93-
helm upgrade airlock-microgateway-cni -n kube-system --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3'
93+
helm upgrade airlock-microgateway-cni -n kube-system --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0'
9494
helm test airlock-microgateway-cni -n kube-system --logs
95-
helm upgrade airlock-microgateway-cni -n kube-system --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3'
95+
helm upgrade airlock-microgateway-cni -n kube-system --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0'
9696
```
9797
```console
9898
# OpenShift setup
99-
helm upgrade airlock-microgateway-cni -n openshift-operators --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3'
99+
helm upgrade airlock-microgateway-cni -n openshift-operators --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0'
100100
helm test airlock-microgateway-cni -n openshift-operators --logs
101-
helm upgrade airlock-microgateway-cni -n openshift-operators --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.5.3'
101+
helm upgrade airlock-microgateway-cni -n openshift-operators --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway-cni --version '4.6.0'
102102
```
103103

104104
Consult our [documentation](https://docs.airlock.com/microgateway/latest/?topic=MGW-00000139) in case of any installation error.
@@ -116,22 +116,22 @@ helm install cert-manager jetstack/cert-manager --version 'v1.16.3' -n cert-mana
116116
kubectl -n airlock-microgateway-system create secret generic airlock-microgateway-license --from-file=microgateway-license.txt
117117

118118
# Install Operator (CRDs are included via the standard Helm 3 mechanism, i.e. Helm will handle initial installation but not upgrades)
119-
helm install airlock-microgateway -n airlock-microgateway-system oci://quay.io/airlockcharts/microgateway --version '4.5.3' --wait
119+
helm install airlock-microgateway -n airlock-microgateway-system oci://quay.io/airlockcharts/microgateway --version '4.6.0' --wait
120120
```
121121

122122
2. (Recommended) You can verify the correctness of the installation with `helm test`.
123123
```console
124-
helm upgrade airlock-microgateway -n airlock-microgateway-system --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway --version '4.5.3'
124+
helm upgrade airlock-microgateway -n airlock-microgateway-system --set tests.enabled=true --reuse-values oci://quay.io/airlockcharts/microgateway --version '4.6.0'
125125
helm test airlock-microgateway -n airlock-microgateway-system --logs
126-
helm upgrade airlock-microgateway -n airlock-microgateway-system --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway --version '4.5.3'
126+
helm upgrade airlock-microgateway -n airlock-microgateway-system --set tests.enabled=false --reuse-values oci://quay.io/airlockcharts/microgateway --version '4.6.0'
127127
```
128128

129129
### Upgrading CRDs
130130

131131
The `helm install/upgrade` command currently does not support upgrading CRDs that already exist in the cluster.
132132
CRDs should instead be manually upgraded before upgrading the Operator itself via the following command:
133133
```console
134-
kubectl apply -k https://github.com/airlock/microgateway/deploy/charts/airlock-microgateway/crds/?ref=4.5.3 --server-side --force-conflicts
134+
kubectl apply -k https://github.com/airlock/microgateway/deploy/charts/airlock-microgateway/crds/?ref=4.6.0 --server-side --force-conflicts
135135
```
136136

137137
**Note**: Certain GitOps solutions such as e.g. Argo CD or Flux CD have their own mechanisms for automatically upgrading CRDs included with Helm charts.

‎deploy/bundles/airlock-microgateway/bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
55
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=airlock-microgateway
8-
LABEL operators.operatorframework.io.bundle.channels.v1="4.5,stable"
9-
LABEL operators.operatorframework.io.bundle.channel.default.v1="4.5"
8+
LABEL operators.operatorframework.io.bundle.channels.v1="4.6,stable"
9+
LABEL operators.operatorframework.io.bundle.channel.default.v1="4.6"
1010
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=unknown

‎deploy/bundles/airlock-microgateway/manifests/airlock-microgateway-dashboard-accessctrllogs_v1_configmap.yaml

Lines changed: 110 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ data:
1010
"type": "datasource",
1111
"pluginId": "loki",
1212
"pluginName": "Loki"
13+
},
14+
{
15+
"name": "DS_PROMETHEUS",
16+
"label": "Prometheus",
17+
"description": "",
18+
"type": "datasource",
19+
"pluginId": "prometheus",
20+
"pluginName": "Prometheus"
1321
}
1422
],
1523
"__elements": {},
@@ -302,7 +310,7 @@ data:
302310
"uid": "${DS_LOKI}"
303311
},
304312
"editorMode": "code",
305-
"expr": "{container=\"airlock-microgateway-engine\"} |= \"access_control\" |= \"envoy.access\" | json http_method=\"http.request.method\", url=\"url.path\", domain=\"url.domain\", request_size=\"http.request.bytes\", client_ip=\"network.forwarded_ip\", request_id=\"http.request.id\", user_id=\"airlock.access_control.user_id\", details=\"airlock.access_control.details\", policy=\"airlock.access_control.policy\", status=\"airlock.access_control.status\", authenticated=\"airlock.access_control.authenticated\", response_code=\"http.response.status_code\", authorized=\"airlock.access_control.authorized\", log_type=\"event.dataset\" | log_type = `envoy.access`",
313+
"expr": "{container=\"airlock-microgateway-engine\", pod=~\"${gateway_pod:regex}\"} |= \"access_control\" |= \"envoy.access\" | json http_method=\"http.request.method\", url=\"url.path\", domain=\"url.domain\", request_size=\"http.request.bytes\", client_ip=\"network.forwarded_ip\", request_id=\"http.request.id\", user_id=\"airlock.access_control.user_id\", details=\"airlock.access_control.details\", policy=\"airlock.access_control.policy\", status=\"airlock.access_control.status\", authenticated=\"airlock.access_control.authenticated\", response_code=\"http.response.status_code\", authorized=\"airlock.access_control.authorized\", log_type=\"event.dataset\" | log_type = `envoy.access`",
306314
"hide": false,
307315
"queryType": "range",
308316
"refId": "Access Control Logs"
@@ -412,39 +420,129 @@ data:
412420
"type": "datasource"
413421
},
414422
{
415-
"allValue": ".*",
423+
"current": {},
424+
"hide": 2,
425+
"includeAll": false,
426+
"label": "DS_PROMETHEUS",
427+
"name": "DS_PROMETHEUS",
428+
"options": [],
429+
"query": "prometheus",
430+
"refresh": 1,
431+
"regex": "",
432+
"type": "datasource"
433+
},
434+
{
435+
"current": {},
436+
"datasource": {
437+
"type": "prometheus",
438+
"uid": "${DS_PROMETHEUS}"
439+
},
440+
"definition": "label_values(microgateway_build_info,gateway_kind)",
441+
"description": "Allows filtering on the gateway kind.",
442+
"includeAll": true,
443+
"label": "Gateway Kind",
444+
"name": "gateway_kind",
445+
"options": [],
446+
"query": {
447+
"qryType": 1,
448+
"query": "label_values(microgateway_build_info,gateway_kind)",
449+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
450+
},
451+
"refresh": 1,
452+
"regex": "",
453+
"type": "query"
454+
},
455+
{
456+
"allValue": ".+",
457+
"description" : "Allows filtering on the managing operator instance.",
416458
"current": {},
417459
"datasource": {
418460
"type": "prometheus",
419461
"uid": "${DS_PROMETHEUS}"
420462
},
421-
"definition": "label_values(microgateway_license_http_rq_total,namespace)",
463+
"definition": "label_values(microgateway_build_info,managed_by)",
464+
"includeAll": true,
465+
"label": "Microgateway Operator",
466+
"multi": true,
467+
"name": "operator",
468+
"options": [],
469+
"query": {
470+
"qryType": 1,
471+
"query": "label_values(microgateway_build_info,managed_by)",
472+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
473+
},
474+
"refresh": 2,
475+
"regex": ".*",
476+
"type": "query"
477+
},
478+
{
479+
"allValue": ".+",
480+
"current": {},
481+
"description" : "Allows filtering on the namespaces in which gateways are deployed.",
482+
"datasource": {
483+
"type": "prometheus",
484+
"uid": "${DS_PROMETHEUS}"
485+
},
486+
"definition": "label_values(microgateway_build_info{managed_by=~\"$operator\"},namespace)",
422487
"includeAll": true,
423488
"label": "Gateway Namespace",
424489
"multi": true,
425490
"name": "namespace",
426491
"options": [],
427492
"query": {
428493
"qryType": 1,
429-
"query": "label_values(microgateway_license_http_rq_total,namespace)",
494+
"query": "label_values(microgateway_build_info{managed_by=~\"$operator\"},namespace)",
430495
"refId": "PrometheusVariableQueryEditor-VariableQuery"
431496
},
432497
"refresh": 2,
433498
"regex": "",
434-
"sort": 5,
435499
"type": "query"
436500
},
437501
{
438502
"current": {},
503+
"datasource": {
504+
"type": "prometheus",
505+
"uid": "${DS_PROMETHEUS}"
506+
},
507+
"description" : "Allows filtering on specific gateway instance names within the selected namespaces.",
508+
"definition": "label_values(microgateway_build_info{managed_by=~\"$operator\", namespace=~\"$namespace\", gateway_kind=~\"$gateway_kind\"},gateway)",
509+
"includeAll": true,
510+
"label": "Gateway Name",
511+
"multi": true,
512+
"name": "gateway_name",
513+
"options": [],
514+
"query": {
515+
"qryType": 1,
516+
"query": "label_values(microgateway_build_info{managed_by=~\"$operator\", namespace=~\"$namespace\", gateway_kind=~\"$gateway_kind\"},gateway)",
517+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
518+
},
519+
"refresh": 2,
520+
"regex": "",
521+
"sort": 1,
522+
"type": "query"
523+
},
524+
{
525+
"allowCustomValue": false,
526+
"current": {},
527+
"datasource": {
528+
"type": "prometheus",
529+
"uid": "${DS_PROMETHEUS}"
530+
},
531+
"definition": "label_values(microgateway_build_info{managed_by=~\"$operator\", namespace=~\"$namespace\", gateway_kind=~\"$gateway_kind\", gateway=~\"$gateway_name\"},pod)",
439532
"hide": 2,
440-
"includeAll": false,
441-
"label": "DS_PROMETHEUS",
442-
"name": "DS_PROMETHEUS",
533+
"includeAll": true,
534+
"label": "Gateway Pod",
535+
"multi": true,
536+
"name": "gateway_pod",
443537
"options": [],
444-
"query": "prometheus",
445-
"refresh": 1,
538+
"query": {
539+
"qryType": 1,
540+
"query": "label_values(microgateway_build_info{managed_by=~\"$operator\", namespace=~\"$namespace\", gateway_kind=~\"$gateway_kind\", gateway=~\"$gateway_name\"},pod)",
541+
"refId": "PrometheusVariableQueryEditor-VariableQuery"
542+
},
543+
"refresh": 2,
446544
"regex": "",
447-
"type": "datasource"
545+
"type": "query"
448546
}
449547
]
450548
},
@@ -468,6 +566,6 @@ metadata:
468566
app.kubernetes.io/instance: airlock-microgateway
469567
app.kubernetes.io/name: microgateway-operator
470568
app.kubernetes.io/part-of: microgateway
471-
app.kubernetes.io/version: 4.5.3
569+
app.kubernetes.io/version: 4.6.0
472570
grafana_dashboard: "1"
473571
name: airlock-microgateway-dashboard-accessctrllogs

0 commit comments

Comments
 (0)