diff --git a/Makefile b/Makefile index 278981a..ff66e60 100644 --- a/Makefile +++ b/Makefile @@ -43,8 +43,8 @@ diff: $(environment) .PHONY: apply apply: $(environment) - $(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l managed-by=kustomize-cluster -f $(ENVOUTDIR) - $(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l managed-by=kustomize -f $(ENVOUTDIR) + $(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l app.kubernetes.io/managed-by=kustomize-cluster -f $(ENVOUTDIR) + $(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -l app.kubernetes.io/managed-by=kustomize -f $(ENVOUTDIR) .PHONY: all dev prod all: dev prod diff --git a/kustomize/bases/blackbox-exporter/kustomization.yaml b/kustomize/bases/blackbox-exporter/kustomization.yaml index d52599e..bb41de5 100644 --- a/kustomize/bases/blackbox-exporter/kustomization.yaml +++ b/kustomize/bases/blackbox-exporter/kustomization.yaml @@ -1,2 +1,6 @@ resources: - - blackbox-exporter-deployment.yaml \ No newline at end of file + - blackbox-exporter-deployment.yaml + +commonLabels: + app.kubernetes.io/name: blackbox-exporter + app.kubernetes.io/part-of: monitoring \ No newline at end of file diff --git a/kustomize/bases/drone-runner/kustomization.yaml b/kustomize/bases/drone-runner/kustomization.yaml index e47e165..bbb8b0f 100644 --- a/kustomize/bases/drone-runner/kustomization.yaml +++ b/kustomize/bases/drone-runner/kustomization.yaml @@ -1,2 +1,6 @@ resources: - drone-runner-deployment.yaml + +commonLabels: + app.kubernetes.io/name: drone + app.kubernetes.io/component: runner diff --git a/kustomize/bases/drone-server/kustomization.yaml b/kustomize/bases/drone-server/kustomization.yaml index 236d74b..a8666f8 100644 --- a/kustomize/bases/drone-server/kustomization.yaml +++ b/kustomize/bases/drone-server/kustomization.yaml @@ -2,6 +2,10 @@ resources: - drone-server-deployment.yaml - drone-server-ingress.yaml +commonLabels: + app.kubernetes.io/name: drone + app.kubernetes.io/component: server + secretGenerator: - name: drone-secret type: Opaque diff --git a/kustomize/bases/ecommerce-exporter/kustomization.yaml b/kustomize/bases/ecommerce-exporter/kustomization.yaml index f2c0777..b04a031 100644 --- a/kustomize/bases/ecommerce-exporter/kustomization.yaml +++ b/kustomize/bases/ecommerce-exporter/kustomization.yaml @@ -1,6 +1,10 @@ resources: - ecommerce-exporter-deployment.yaml +commonLabels: + app.kubernetes.io/name: ecommerce-exporter + app.kubernetes.io/part-of: monitoring + configMapGenerator: - name: ecommerce-exporter-config literals: diff --git a/kustomize/bases/gitea/kustomization.yaml b/kustomize/bases/gitea/kustomization.yaml index 44654b9..eee3f49 100644 --- a/kustomize/bases/gitea/kustomization.yaml +++ b/kustomize/bases/gitea/kustomization.yaml @@ -2,6 +2,10 @@ resources: - gitea-deployment.yaml - gitea-ingress.yaml +commonLabels: + app.kubernetes.io/name: gitea + app.kubernetes.io/component: server + # secretGenerator: # - name: postgres-credentials # type: Opaque diff --git a/kustomize/bases/grafana-agent/kustomization.yaml b/kustomize/bases/grafana-agent/kustomization.yaml index 8362459..e0f9889 100644 --- a/kustomize/bases/grafana-agent/kustomization.yaml +++ b/kustomize/bases/grafana-agent/kustomization.yaml @@ -1,6 +1,10 @@ resources: - https://raw.githubusercontent.com/grafana/agent/v0.24.2/production/kubernetes/agent-bare.yaml +commonLabels: + app.kubernetes.io/name: grafana-agent + app.kubernetes.io/part-of: monitoring + secretGenerator: - name: grafana-agent behavior: create diff --git a/kustomize/bases/grafana/kustomization.yaml b/kustomize/bases/grafana/kustomization.yaml index fffefda..bb3eeaf 100644 --- a/kustomize/bases/grafana/kustomization.yaml +++ b/kustomize/bases/grafana/kustomization.yaml @@ -2,6 +2,10 @@ resources: - grafana-deployment.yaml - grafana-ingress.yaml +commonLabels: + app.kubernetes.io/name: grafana + app.kubernetes.io/part-of: monitoring + configMapGenerator: - name: grafana-datasources files: diff --git a/kustomize/bases/kube-state-metrics/kustomization.yaml b/kustomize/bases/kube-state-metrics/kustomization.yaml index 4c1a124..7bf9ff2 100644 --- a/kustomize/bases/kube-state-metrics/kustomization.yaml +++ b/kustomize/bases/kube-state-metrics/kustomization.yaml @@ -6,4 +6,5 @@ resources: - https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.1.1/examples/standard/service.yaml commonLabels: - app.kubernetes.io/name: kube-state-metrics \ No newline at end of file + app.kubernetes.io/name: kube-state-metrics + app.kubernetes.io/part-of: monitoring diff --git a/kustomize/bases/kubernetes-dashboard/kustomization.yaml b/kustomize/bases/kubernetes-dashboard/kustomization.yaml index 8cc63bf..4176e34 100644 --- a/kustomize/bases/kubernetes-dashboard/kustomization.yaml +++ b/kustomize/bases/kubernetes-dashboard/kustomization.yaml @@ -3,4 +3,7 @@ resources: - dashboard-admin-user.yaml - dashboard-ingress.yaml +commonLabels: + app.kubernetes.io/name: kubernetes-dashboard + namespace: kubernetes-dashboard diff --git a/kustomize/bases/longhorn/kustomization.yaml b/kustomize/bases/longhorn/kustomization.yaml index cdba8a7..aae3789 100644 --- a/kustomize/bases/longhorn/kustomization.yaml +++ b/kustomize/bases/longhorn/kustomization.yaml @@ -3,6 +3,9 @@ resources: - longhorn-helmchart.yaml - longhorn-recurringjob.yaml +commonLabels: + app.kubernetes.io/name: longhorn + secretGenerator: - name: s3-backupstore-credentials type: Opaque diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 8efc510..035f0ee 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -73,11 +73,11 @@ spec: containerPort: 80 resources: requests: - cpu: 1000m - memory: 1Gi + cpu: 2000m + memory: 2Gi limits: - cpu: 1000m - memory: 1Gi + cpu: 3000m + memory: 3Gi volumeMounts: - name: nextcloud-pv mountPath: /var/www/html diff --git a/kustomize/bases/node-exporter/kustomization.yaml b/kustomize/bases/node-exporter/kustomization.yaml index afe897a..1e08fc0 100644 --- a/kustomize/bases/node-exporter/kustomization.yaml +++ b/kustomize/bases/node-exporter/kustomization.yaml @@ -1,2 +1,6 @@ resources: - node-exporter-daemonset.yaml + +commonLabels: + app.kubernetes.io/name: node-exporter + app.kubernetes.io/part-of: monitoring diff --git a/kustomize/bases/postgres/kustomization.yaml b/kustomize/bases/postgres/kustomization.yaml index 32c42d1..a53d021 100644 --- a/kustomize/bases/postgres/kustomization.yaml +++ b/kustomize/bases/postgres/kustomization.yaml @@ -1,6 +1,9 @@ resources: - postgres-statefulset.yaml +commonLabels: + app.kubernetes.io/component: postgres + secretGenerator: - name: postgres-credentials type: Opaque diff --git a/kustomize/bases/postgres/postgres-statefulset.yaml b/kustomize/bases/postgres/postgres-statefulset.yaml index cf4e44e..ecf7e80 100644 --- a/kustomize/bases/postgres/postgres-statefulset.yaml +++ b/kustomize/bases/postgres/postgres-statefulset.yaml @@ -64,10 +64,10 @@ kind: Service metadata: name: postgres labels: - app.kubernetes.io/name: postgres + app.kubernetes.io/component: postgres spec: selector: - app.kubernetes.io/name: postgres + app.kubernetes.io/component: postgres ports: - name: postgres port: 5432 diff --git a/kustomize/bases/prometheus-operator/kustomization.yaml b/kustomize/bases/prometheus-operator/kustomization.yaml index 9754c49..b14def4 100644 --- a/kustomize/bases/prometheus-operator/kustomization.yaml +++ b/kustomize/bases/prometheus-operator/kustomization.yaml @@ -1,2 +1,5 @@ resources: - - https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.50/bundle.yaml \ No newline at end of file + - https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.50/bundle.yaml + +commonLabels: + app.kubernetes.io/part-of: monitoring \ No newline at end of file diff --git a/kustomize/bases/prometheus/kustomization.yaml b/kustomize/bases/prometheus/kustomization.yaml index 3d834b4..b60bd9c 100644 --- a/kustomize/bases/prometheus/kustomization.yaml +++ b/kustomize/bases/prometheus/kustomization.yaml @@ -4,6 +4,10 @@ resources: - prometheus-ingress.yaml - traefik-podmonitor.yaml +commonLabels: + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: monitoring + secretGenerator: - name: grafana-cloud-credentials type: Opaque diff --git a/kustomize/bases/redis/kustomization.yaml b/kustomize/bases/redis/kustomization.yaml index 1f0c79a..1e43551 100644 --- a/kustomize/bases/redis/kustomization.yaml +++ b/kustomize/bases/redis/kustomization.yaml @@ -1,6 +1,9 @@ resources: - redis-deployment.yaml +commonLabels: + app.kubernetes.io/component: redis + secretGenerator: - name: redis-credentials type: Opaque diff --git a/kustomize/bases/redis/redis-deployment.yaml b/kustomize/bases/redis/redis-deployment.yaml index 059fd0c..12dddd5 100644 --- a/kustomize/bases/redis/redis-deployment.yaml +++ b/kustomize/bases/redis/redis-deployment.yaml @@ -40,10 +40,10 @@ kind: Service metadata: name: redis labels: - app.kubernetes.io/name: redis + app.kubernetes.io/component: redis spec: selector: - app.kubernetes.io/name: redis + app.kubernetes.io/component: redis ports: - name: redis port: 6379 diff --git a/kustomize/bases/traefik/kustomization.yaml b/kustomize/bases/traefik/kustomization.yaml index 7ba7492..8aa90a1 100644 --- a/kustomize/bases/traefik/kustomization.yaml +++ b/kustomize/bases/traefik/kustomization.yaml @@ -1,4 +1,7 @@ # http://localhost:8001/api/v1/namespaces/kube-system/services/traefik:traefik resources: - - traefik-helmchartconfig.yaml \ No newline at end of file + - traefik-helmchartconfig.yaml + +commonLabels: + app.kubernetes.io/name: traefik diff --git a/kustomize/namespaces/grafana/kustomization.yaml b/kustomize/namespaces/grafana/kustomization.yaml deleted file mode 100644 index 2720799..0000000 --- a/kustomize/namespaces/grafana/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -bases: - - ../../bases/grafana - -resources: - - namespace.yaml - -namespace: grafana diff --git a/kustomize/namespaces/grafana/namespace.yaml b/kustomize/namespaces/grafana/namespace.yaml deleted file mode 100644 index 678134a..0000000 --- a/kustomize/namespaces/grafana/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: grafana \ No newline at end of file diff --git a/kustomize/namespaces/kube-system/kustomization.yaml b/kustomize/namespaces/kube-system/kustomization.yaml index 55db8dc..0527ea0 100644 --- a/kustomize/namespaces/kube-system/kustomization.yaml +++ b/kustomize/namespaces/kube-system/kustomization.yaml @@ -1,4 +1,5 @@ bases: - ../../bases/traefik + - ../../bases/prometheus-operator namespace: kube-system diff --git a/kustomize/namespaces/monitoring/kustomization.yaml b/kustomize/namespaces/monitoring/kustomization.yaml index 25420a5..785c2b4 100644 --- a/kustomize/namespaces/monitoring/kustomization.yaml +++ b/kustomize/namespaces/monitoring/kustomization.yaml @@ -5,6 +5,7 @@ bases: - ../../bases/ecommerce-exporter - ../../bases/kube-state-metrics - ../../bases/grafana-agent + - ../../bases/grafana - servicemonitors/any-namespaces-http.yaml - servicemonitors/kubelet.yaml - servicemonitors/longhorn.yaml diff --git a/kustomize/namespaces/operators/kustomization.yaml b/kustomize/namespaces/operators/kustomization.yaml deleted file mode 100644 index 5137336..0000000 --- a/kustomize/namespaces/operators/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -bases: - - ../../bases/prometheus-operator - -resources: - - namespace.yaml - -namespace: operators diff --git a/kustomize/namespaces/operators/namespace.yaml b/kustomize/namespaces/operators/namespace.yaml deleted file mode 100644 index bd80088..0000000 --- a/kustomize/namespaces/operators/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: operators \ No newline at end of file diff --git a/kustomize/overlays/prod-cluster/kustomization.yaml b/kustomize/overlays/prod-cluster/kustomization.yaml index 995da4d..555e3ab 100644 --- a/kustomize/overlays/prod-cluster/kustomization.yaml +++ b/kustomize/overlays/prod-cluster/kustomization.yaml @@ -1,11 +1,10 @@ bases: - ../../namespaces/kube-system - - ../../namespaces/operators - ../../bases/longhorn -# allow "kubectl apply -l managed-by=cluster --prune ..." +# allow "kubectl apply -l app.kubernetes.io/managed-by=cluster --prune ..." commonLabels: - managed-by: kustomize-cluster + app.kubernetes.io/managed-by: kustomize-cluster transformers: - transformers/placeholders.yaml diff --git a/kustomize/overlays/prod/configurations/ecommerce-exporter/ecommerce-exporter.yml b/kustomize/overlays/prod/configurations/ecommerce-exporter/ecommerce-exporter.yml index da2c6c8..12aa4e0 100644 --- a/kustomize/overlays/prod/configurations/ecommerce-exporter/ecommerce-exporter.yml +++ b/kustomize/overlays/prod/configurations/ecommerce-exporter/ecommerce-exporter.yml @@ -1,85 +1,107 @@ products: - - name: i5-12600k - targets: - - parser: html - url: https://www.amazon.ca/Intel-i5-12600K-Desktop-Processor-Unlocked/dp/B09FX4D72T/ - selector: '.priceToPay .a-offscreen::text' - - parser: json - url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=19-118-347&RecommendItem=&BestSellerItemList=9SIAA4YJ3X7676%2C9SIADGEGRN9541%2C9SIA7BBGRN9510&IsVATPrice=true - selector: '.MainItem.FinalPrice' - - parser: json - url: https://www.bestbuy.ca/api/offers/v1/products/15778668/offers?postalCode=J4L - selector: '.[] | .salePrice,.regularPrice' - - parser: html - url: https://www.canadacomputers.com/product_info.php?cPath=4_65_3860&item_id=201282 - selector: '.price-show-panel .h2-big strong::text' - - parser: html - url: https://www.memoryexpress.com/Products/MX00119045 - selector: '.GrandTotal' - - name: i7-12700k - targets: - - parser: html - url: https://www.amazon.ca/Intel-i7-12700K-Desktop-Processor-Unlocked/dp/B09FXNVDBJ/ - selector: '.priceToPay .a-offscreen::text' - - parser: json - url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=19-118-343&RecommendItem=&BestSellerItemList=9SIAA4YGC82324%2C9SIADGEGMY7603%2C9SIAVH1J0A6685&IsVATPrice=true - selector: '.MainItem.FinalPrice' - - parser: json - url: https://www.bestbuy.ca/api/offers/v1/products/15778672/offers?postalCode=J4L - selector: '.[] | .salePrice,.regularPrice' - - parser: html - url: https://www.canadacomputers.com/product_info.php?cPath=4_65_3860&item_id=201280 - selector: '.price-show-panel .h2-big strong::text' - - parser: html - url: https://www.memoryexpress.com/Products/MX00119043 - selector: '.GrandTotal' - - name: NH-U12S redux - targets: - - parser: html - url: https://www.amazon.ca/Noctua-NH-U12S-Performance-Cooler-redux-1700/dp/B08WPDD6GD/ - selector: '.priceToPay .a-offscreen::text' - - parser: json - url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=9SIAB98DXP3361&RecommendItem=&BestSellerItemList=9SIB9H0H0H0660&IsVATPrice=true - selector: '.MainItem.FinalPrice' - - parser: json - url: https://www.bestbuy.ca/api/offers/v1/products/16580299/offers?postalCode=J4L - selector: '.[] | .salePrice,.regularPrice' - - name: ASUS Prime B660M-A D4 - targets: - - parser: html - url: https://www.amazon.ca/Prime-B660M-D4-Motherboard-Type-C/dp/B09NWF1JQC - selector: '.priceToPay .a-offscreen::text' - - parser: json - url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=13-119-541&RecommendItem=&BestSellerItemList=9SIADGEGZU2598&IsVATPrice=true - selector: '.MainItem.FinalPrice' - - parser: json - url: https://www.bestbuy.ca/api/offers/v1/products/15954559/offers?postalCode=J4L - selector: '.[] | .salePrice,.regularPrice' - - parser: html - url: https://www.canadacomputers.com/product_info.php?cPath=26_1842_3869&item_id=213279 - selector: '.price-show-panel .h2-big strong::text' - - parser: html - url: https://www.memoryexpress.com/Products/MX00119756 - selector: '.GrandTotal' - - name: MSI PRO B660M-A - targets: - - parser: html - url: https://www.amazon.ca/MSI-PRO-B660M-DDR4-Motherboard/dp/B09NTMRRTL/ - selector: '.priceToPay .a-offscreen::text' - - parser: json - url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=13-144-531&RecommendItem=&BestSellerItemList=9SIA9H5HS67633%2C9SIA7BBHWY8396%2C9SIADDZJ183773&IsVATPrice=true - selector: '.MainItem.FinalPrice' - - parser: json - url: https://www.bestbuy.ca/api/offers/v1/products/16486621/offers?postalCode=J4L - selector: '.[] | .salePrice,.regularPrice' - - parser: html - url: https://www.canadacomputers.com/product_info.php?cPath=26_1842_3869&item_id=213893 - selector: '.price-show-panel .h2-big strong::text' - - parser: html - url: https://www.memoryexpress.com/Products/MX00120369 - selector: '.GrandTotal' - - name: 8Bitdo Ultimate Bluetooth Controller - targets: - - parser: html - url: https://www.amazon.ca/8Bitdo-Ultimate-Bluetooth-Controller-Charging/dp/B0B9BGJVLL/ - selector: '.priceToPay .a-offscreen::text' \ No newline at end of file + # - name: i5-12600k + # targets: + # - parser: html + # url: https://www.amazon.ca/Intel-i5-12600K-Desktop-Processor-Unlocked/dp/B09FX4D72T/ + # selector: '.priceToPay .a-offscreen::text' + # - parser: json + # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=19-118-347&RecommendItem=&BestSellerItemList=9SIAA4YJ3X7676%2C9SIADGEGRN9541%2C9SIA7BBGRN9510&IsVATPrice=true + # selector: '.MainItem.FinalPrice' + # - parser: json + # url: https://www.bestbuy.ca/api/offers/v1/products/15778668/offers?postalCode=J4L + # selector: '.[] | .salePrice,.regularPrice' + # - parser: html + # url: https://www.canadacomputers.com/product_info.php?cPath=4_65_3860&item_id=201282 + # selector: '.price-show-panel .h2-big strong::text' + # - parser: html + # url: https://www.memoryexpress.com/Products/MX00119045 + # selector: '.GrandTotal' + # - name: i7-12700k + # targets: + # - parser: html + # url: https://www.amazon.ca/Intel-i7-12700K-Desktop-Processor-Unlocked/dp/B09FXNVDBJ/ + # selector: '.priceToPay .a-offscreen::text' + # - parser: json + # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=19-118-343&RecommendItem=&BestSellerItemList=9SIAA4YGC82324%2C9SIADGEGMY7603%2C9SIAVH1J0A6685&IsVATPrice=true + # selector: '.MainItem.FinalPrice' + # - parser: json + # url: https://www.bestbuy.ca/api/offers/v1/products/15778672/offers?postalCode=J4L + # selector: '.[] | .salePrice,.regularPrice' + # - parser: html + # url: https://www.canadacomputers.com/product_info.php?cPath=4_65_3860&item_id=201280 + # selector: '.price-show-panel .h2-big strong::text' + # - parser: html + # url: https://www.memoryexpress.com/Products/MX00119043 + # selector: '.GrandTotal' + # # - name: NH-U12S redux + # # targets: + # # - parser: html + # # url: https://www.amazon.ca/Noctua-NH-U12S-Performance-Cooler-redux-1700/dp/B08WPDD6GD/ + # # selector: '.priceToPay .a-offscreen::text' + # # - parser: json + # # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=9SIAB98DXP3361&RecommendItem=&BestSellerItemList=9SIB9H0H0H0660&IsVATPrice=true + # # selector: '.MainItem.FinalPrice' + # # - parser: json + # # url: https://www.bestbuy.ca/api/offers/v1/products/16580299/offers?postalCode=J4L + # # selector: '.[] | .salePrice,.regularPrice' + # - name: ASUS Prime B660M-A D4 + # targets: + # - parser: html + # url: https://www.amazon.ca/Prime-B660M-D4-Motherboard-Type-C/dp/B09NWF1JQC + # selector: '.priceToPay .a-offscreen::text' + # - parser: json + # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=13-119-541&RecommendItem=&BestSellerItemList=9SIADGEGZU2598&IsVATPrice=true + # selector: '.MainItem.FinalPrice' + # - parser: json + # url: https://www.bestbuy.ca/api/offers/v1/products/15954559/offers?postalCode=J4L + # selector: '.[] | .salePrice,.regularPrice' + # - parser: html + # url: https://www.canadacomputers.com/product_info.php?cPath=26_1842_3869&item_id=213279 + # selector: '.price-show-panel .h2-big strong::text' + # - parser: html + # url: https://www.memoryexpress.com/Products/MX00119756 + # selector: '.GrandTotal' + # - name: MSI PRO B660M-A + # targets: + # - parser: html + # url: https://www.amazon.ca/MSI-PRO-B660M-DDR4-Motherboard/dp/B09NTMRRTL/ + # selector: '.priceToPay .a-offscreen::text' + # - parser: json + # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=13-144-531&RecommendItem=&BestSellerItemList=9SIA9H5HS67633%2C9SIA7BBHWY8396%2C9SIADDZJ183773&IsVATPrice=true + # selector: '.MainItem.FinalPrice' + # - parser: json + # url: https://www.bestbuy.ca/api/offers/v1/products/16486621/offers?postalCode=J4L + # selector: '.[] | .salePrice,.regularPrice' + # - parser: html + # url: https://www.canadacomputers.com/product_info.php?cPath=26_1842_3869&item_id=213893 + # selector: '.price-show-panel .h2-big strong::text' + # - parser: html + # url: https://www.memoryexpress.com/Products/MX00120369 + # selector: '.GrandTotal' + # - name: ASUS Prime Z690M-Plus D4 + # targets: + # - parser: html + # url: https://www.amazon.ca/Z690M-Plus-D4-Motherboard-Connector-Thunderbolt/dp/B09JRW446Z/ + # selector: '.priceToPay .a-offscreen::text' + # - parser: json + # url: https://www.newegg.ca/product/api/ProductRealtime?ItemNumber=13-119-515 + # selector: '.MainItem.FinalPrice' + # - parser: json + # url: https://www.bestbuy.ca/api/offers/v1/products/15892764/offers?postalCode=J4L + # selector: '.[] | .salePrice,.regularPrice' + # - parser: html + # url: https://www.canadacomputers.com/product_info.php?cPath=26_1842_3869&item_id=209060 + # selector: '.price-show-panel .h2-big strong::text' + # - parser: html + # url: https://www.memoryexpress.com/Products/MX00119111 + # selector: '.GrandTotal' + # - name: 8Bitdo Ultimate Bluetooth Controller + # targets: + # - parser: html + # url: https://www.amazon.ca/8Bitdo-Ultimate-Bluetooth-Controller-Charging/dp/B0B9BGJVLL/ + # selector: '.priceToPay .a-offscreen::text' + # - name: Sony S100F 2.0 CH + # targets: + # - parser: html + # url: https://www.amazon.ca/Sony-HTS100F-Surround-Soundbar-Bluetooth/dp/B0797MY6JB?th=1 + # selector: '.priceToPay .a-offscreen::text' \ No newline at end of file diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index 158d3b3..22a6955 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -1,7 +1,6 @@ resources: # - ../../namespaces/kubernetes-dashboard - ../../namespaces/gitea - - ../../namespaces/grafana - ../../namespaces/monitoring - ../../namespaces/nextcloud @@ -24,7 +23,7 @@ images: newTag: 1.0.0-rc.3 - name: nextcloud newName: badjware/nextcloud-tweak - newTag: 24.0.6 + newTag: 25.0.3 - name: postgres newTag: 9.6.23 - name: redis @@ -74,7 +73,7 @@ secretGenerator: - agent.yaml=configurations/grafana-agent/agent.yaml - name: grafana-config type: Opaque - namespace: grafana + namespace: monitoring behavior: replace files: - custom.ini=configurations/grafana/custom.ini @@ -92,9 +91,9 @@ secretGenerator: files: - prometheus-additional.yaml=configurations/prometheus/prometheus-additional.yaml -# allow "kubectl apply -l managed-by=kustomize --prune ..." +# allow "kubectl apply -l app.kubernetes.io/managed-by=kustomize --prune ..." commonLabels: - managed-by: kustomize + app.kubernetes.io/managed-by: kustomize transformers: - transformers/placeholders.yaml