diff --git a/components/namespace-lister/base/kustomization.yaml b/components/namespace-lister/base/kustomization.yaml index 28c42d2a017..ef67e67607d 100644 --- a/components/namespace-lister/base/kustomization.yaml +++ b/components/namespace-lister/base/kustomization.yaml @@ -4,16 +4,7 @@ resources: - deployment.yaml - namespace.yaml - rbac.yaml -- proxy.yaml -- route.yaml -- service.yaml namespace: namespace-lister -configMapGenerator: -- files: - - nginx.conf=nginx.conf - name: proxy-konflux - options: - disableNameSuffixHash: true images: - name: namespace-lister newName: quay.io/konflux-ci/namespace-lister diff --git a/components/namespace-lister/base/nginx.conf b/components/namespace-lister/base/nginx.conf deleted file mode 100644 index e6cf75ca6c4..00000000000 --- a/components/namespace-lister/base/nginx.conf +++ /dev/null @@ -1,59 +0,0 @@ -worker_processes auto; -error_log /var/log/nginx/error.log; -pid /run/nginx.pid; - -# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. -include /usr/share/nginx/modules/*.conf; - -events { - worker_connections 1024; -} - -http { - log_format upstreamlog '[$time_local] $remote_addr - $remote_user - $server_name $host to: $proxy_host $upstream_addr: $request $status upstream_response_time $upstream_response_time msec $msec request_time $request_time'; - access_log /dev/stderr upstreamlog; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 4096; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - server { - listen 8080 default_server; - server_name _; - - location ~* /api/v1/namespaces(/?)$ { - # namespace-lister endpoint - rewrite ^/(.*)/$ /$1 permanent; - proxy_pass https://kubernetes.default.svc; - if ($request_method = GET) { - proxy_pass http://namespace-lister.namespace-lister.svc.cluster.local:12000; - } - proxy_read_timeout 1m; - } - - - location / { - proxy_pass https://kubernetes.default.svc; - proxy_ssl_verify off; - proxy_read_timeout 30m; - proxy_set_header KONFLUX-REQUEST YES; - } - - - location /health { - # Used for liveness probes - return 200; - } - } -} - diff --git a/components/namespace-lister/base/proxy.yaml b/components/namespace-lister/base/proxy.yaml deleted file mode 100644 index 53835c93ac6..00000000000 --- a/components/namespace-lister/base/proxy.yaml +++ /dev/null @@ -1,105 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: namespace-lister-proxy - name: proxy - namespace: namespace-lister - annotations: - ignore-check.kube-linter.io/no-anti-affinity: "Using topologySpreadConstraints" -spec: - minReadySeconds: 60 - progressDeadlineSeconds: 600 - replicas: 3 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: namespace-lister-proxy - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - type: RollingUpdate - template: - metadata: - creationTimestamp: null - labels: - app: namespace-lister-proxy - spec: - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: topology.kubernetes.io/zone - whenUnsatisfiable: ScheduleAnyway - labelSelector: - matchLabels: - app: namespace-lister-proxy - containers: - - command: - - nginx - - -g - - daemon off; - image: registry.access.redhat.com/ubi9/nginx-120@sha256:88a4f2d184f52c4d3956be06b12d578d0bf681ec9d0a8b80e558a98c1860fa12 - imagePullPolicy: IfNotPresent - livenessProbe: - failureThreshold: 3 - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 60 - periodSeconds: 60 - successThreshold: 1 - timeoutSeconds: 1 - name: nginx-120 - ports: - - containerPort: 8080 - name: web - protocol: TCP - readinessProbe: - failureThreshold: 3 - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 60 - periodSeconds: 30 - successThreshold: 3 - timeoutSeconds: 1 - resources: - limits: - cpu: 300m - memory: 256Mi - requests: - cpu: 30m - memory: 128Mi - securityContext: - readOnlyRootFilesystem: true - runAsNonRoot: true - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /etc/nginx/nginx.conf - name: proxy - readOnly: true - subPath: nginx.conf - - mountPath: /var/log/nginx - name: logs - - mountPath: /var/lib/nginx/tmp - name: nginx-tmp - - mountPath: /run - name: run - dnsPolicy: ClusterFirst - volumes: - - configMap: - defaultMode: 420 - items: - - key: nginx.conf - path: nginx.conf - name: proxy-konflux - name: proxy - - emptyDir: {} - name: logs - - emptyDir: {} - name: nginx-tmp - - emptyDir: {} - name: run diff --git a/components/namespace-lister/base/route.yaml b/components/namespace-lister/base/route.yaml deleted file mode 100644 index 4f59155d838..00000000000 --- a/components/namespace-lister/base/route.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - labels: - app: namespace-lister - name: namespace-lister - namespace: namespace-lister -spec: - port: - targetPort: 12000 - tls: - termination: edge - to: - kind: Service - name: namespace-lister - weight: 100 - wildcardPolicy: None diff --git a/components/namespace-lister/base/service.yaml b/components/namespace-lister/base/service.yaml deleted file mode 100644 index e0f29b2a696..00000000000 --- a/components/namespace-lister/base/service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: namespace-lister - namespace: namespace-lister -spec: - selector: - app: namespace-lister-proxy - type: ClusterIP - ports: - - name: http - targetPort: 8080 - port: 12000