diff --git a/artifacts/cluster/releases/test/backend.yaml b/artifacts/cluster/releases/test/backend.yaml index d29e4903..79ac9bbb 100644 --- a/artifacts/cluster/releases/test/backend.yaml +++ b/artifacts/cluster/releases/test/backend.yaml @@ -5,17 +5,17 @@ metadata: namespace: test annotations: flux.weave.works/automated: "true" - flux.weave.works/tag.chart-image: regexp:^1.4.* + flux.weave.works/tag.chart-image: regexp:^1.7.* spec: releaseName: backend chart: repository: https://flagger.app/ name: podinfo - version: 2.0.0 + version: 2.2.0 values: image: repository: quay.io/stefanprodan/podinfo - tag: 1.4.0 + tag: 1.7.0 httpServer: timeout: 30s canary: diff --git a/artifacts/cluster/releases/test/frontend.yaml b/artifacts/cluster/releases/test/frontend.yaml index f2fa539c..0a62c895 100644 --- a/artifacts/cluster/releases/test/frontend.yaml +++ b/artifacts/cluster/releases/test/frontend.yaml @@ -5,17 +5,17 @@ metadata: namespace: test annotations: flux.weave.works/automated: "true" - flux.weave.works/tag.chart-image: semver:~1.4 + flux.weave.works/tag.chart-image: semver:~1.7 spec: releaseName: frontend chart: repository: https://flagger.app/ name: podinfo - version: 2.0.0 + version: 2.2.0 values: image: repository: quay.io/stefanprodan/podinfo - tag: 1.4.0 + tag: 1.7.0 backend: http://backend-podinfo:9898/echo canary: enabled: true diff --git a/artifacts/cluster/releases/test/loadtester.yaml b/artifacts/cluster/releases/test/loadtester.yaml index d098b9f2..bd742d60 100644 --- a/artifacts/cluster/releases/test/loadtester.yaml +++ b/artifacts/cluster/releases/test/loadtester.yaml @@ -11,8 +11,8 @@ spec: chart: repository: https://flagger.app/ name: loadtester - version: 0.1.0 + version: 0.6.0 values: image: - repository: quay.io/stefanprodan/flagger-loadtester - tag: 0.1.0 + repository: weaveworks/flagger-loadtester + tag: 0.6.1 diff --git a/artifacts/configs/canary.yaml b/artifacts/configs/canary.yaml deleted file mode 100644 index 9e666222..00000000 --- a/artifacts/configs/canary.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: flagger.app/v1alpha3 -kind: Canary -metadata: - name: podinfo - namespace: test -spec: - # deployment reference - targetRef: - apiVersion: apps/v1 - kind: Deployment - name: podinfo - # the maximum time in seconds for the canary deployment - # to make progress before it is rollback (default 600s) - progressDeadlineSeconds: 60 - # HPA reference (optional) - autoscalerRef: - apiVersion: autoscaling/v2beta1 - kind: HorizontalPodAutoscaler - name: podinfo - service: - # container port - port: 9898 - # Istio gateways (optional) - gateways: - - public-gateway.istio-system.svc.cluster.local - - mesh - # Istio virtual service host names (optional) - hosts: - - app.iowa.weavedx.com - canaryAnalysis: - # schedule interval (default 60s) - interval: 10s - # max number of failed metric checks before rollback - threshold: 10 - # max traffic percentage routed to canary - # percentage (0-100) - maxWeight: 50 - # canary increment step - # percentage (0-100) - stepWeight: 5 - # Istio Prometheus checks - metrics: - - name: request-success-rate - # minimum req success rate (non 5xx responses) - # percentage (0-100) - threshold: 99 - interval: 1m - - name: request-duration - # maximum req duration P99 - # milliseconds - threshold: 500 - interval: 30s - # external checks (optional) - webhooks: - - name: load-test - url: http://flagger-loadtester.test/ - timeout: 5s - metadata: - cmd: "hey -z 1m -q 10 -c 2 http://podinfo.test:9898/" diff --git a/artifacts/configs/configs.yaml b/artifacts/configs/configs.yaml deleted file mode 100644 index 8e3cfe50..00000000 --- a/artifacts/configs/configs.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: podinfo-config-env - namespace: test -data: - color: blue ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: podinfo-config-vol - namespace: test -data: - output: console - textmode: "true" diff --git a/artifacts/configs/deployment.yaml b/artifacts/configs/deployment.yaml deleted file mode 100644 index 1d2fbe45..00000000 --- a/artifacts/configs/deployment.yaml +++ /dev/null @@ -1,89 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: podinfo - namespace: test - labels: - app: podinfo -spec: - minReadySeconds: 5 - revisionHistoryLimit: 5 - progressDeadlineSeconds: 60 - strategy: - rollingUpdate: - maxUnavailable: 0 - type: RollingUpdate - selector: - matchLabels: - app: podinfo - template: - metadata: - annotations: - prometheus.io/scrape: "true" - labels: - app: podinfo - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:1.3.0 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 9898 - name: http - protocol: TCP - command: - - ./podinfo - - --port=9898 - - --level=info - - --random-delay=false - - --random-error=false - env: - - name: PODINFO_UI_COLOR - valueFrom: - configMapKeyRef: - name: podinfo-config-env - key: color - - name: SECRET_USER - valueFrom: - secretKeyRef: - name: podinfo-secret-env - key: user - livenessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/healthz - initialDelaySeconds: 5 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/readyz - initialDelaySeconds: 5 - timeoutSeconds: 5 - resources: - limits: - cpu: 2000m - memory: 512Mi - requests: - cpu: 100m - memory: 64Mi - volumeMounts: - - name: configs - mountPath: /etc/podinfo/configs - readOnly: true - - name: secrets - mountPath: /etc/podinfo/secrets - readOnly: true - volumes: - - name: configs - configMap: - name: podinfo-config-vol - - name: secrets - secret: - secretName: podinfo-secret-vol diff --git a/artifacts/configs/hpa.yaml b/artifacts/configs/hpa.yaml deleted file mode 100644 index 48ec76e8..00000000 --- a/artifacts/configs/hpa.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: podinfo - namespace: test -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: podinfo - minReplicas: 1 - maxReplicas: 4 - metrics: - - type: Resource - resource: - name: cpu - # scale up if usage is above - # 99% of the requested CPU (100m) - targetAverageUtilization: 99 diff --git a/artifacts/configs/secrets.yaml b/artifacts/configs/secrets.yaml deleted file mode 100644 index 73485871..00000000 --- a/artifacts/configs/secrets.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: podinfo-secret-env - namespace: test -data: - password: cGFzc3dvcmQ= - user: YWRtaW4= ---- -apiVersion: v1 -kind: Secret -metadata: - name: podinfo-secret-vol - namespace: test -data: - key: cGFzc3dvcmQ= diff --git a/artifacts/routing/destination-rule.yaml b/artifacts/routing/destination-rule.yaml deleted file mode 100644 index 2bdea8f2..00000000 --- a/artifacts/routing/destination-rule.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: podinfo - namespace: test -spec: - gateways: - - public-gateway.istio-system.svc.cluster.local - - mesh - hosts: - - podinfo.istio.weavedx.com - - podinfo - http: - - route: - - destination: - host: podinfo - subset: primary - weight: 50 - - destination: - host: podinfo - subset: canary - weight: 50 ---- -apiVersion: networking.istio.io/v1alpha3 -kind: DestinationRule -metadata: - name: podinfo-destination - namespace: test -spec: - host: podinfo - trafficPolicy: - loadBalancer: - consistentHash: - httpCookie: - name: istiouser - ttl: 30s - subsets: - - name: primary - labels: - app: podinfo - role: primary - - name: canary - labels: - app: podinfo - role: canary diff --git a/artifacts/routing/match.yaml b/artifacts/routing/match.yaml deleted file mode 100644 index edf76586..00000000 --- a/artifacts/routing/match.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: podinfo - namespace: test -spec: - gateways: - - public-gateway.istio-system.svc.cluster.local - - mesh - hosts: - - app.istio.weavedx.com - - podinfo - http: - - match: - - headers: - user-agent: - regex: ^(?!.*Chrome)(?=.*\bSafari\b).*$ - uri: - prefix: "/version/" - rewrite: - uri: /api/info - route: - - destination: - host: podinfo-primary - port: - number: 9898 - weight: 0 - - destination: - host: podinfo - port: - number: 9898 - weight: 100 - - match: - - uri: - prefix: "/version/" - rewrite: - uri: /api/info - route: - - destination: - host: podinfo-primary - port: - number: 9898 - weight: 100 diff --git a/artifacts/routing/mirror.yaml b/artifacts/routing/mirror.yaml deleted file mode 100644 index 274c0947..00000000 --- a/artifacts/routing/mirror.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: podinfo - namespace: test - labels: - app: podinfo -spec: - gateways: - - public-gateway.istio-system.svc.cluster.local - - mesh - hosts: - - podinfo.iowa.weavedx.com - - podinfo - http: - - route: - - destination: - host: podinfo-primary - port: - number: 9898 - weight: 100 - mirror: - host: podinfo - port: - number: 9898 diff --git a/artifacts/routing/weight.yaml b/artifacts/routing/weight.yaml deleted file mode 100644 index 5a16f5c3..00000000 --- a/artifacts/routing/weight.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: podinfo - namespace: test - labels: - app: podinfo -spec: - gateways: - - public-gateway.istio-system.svc.cluster.local - - mesh - hosts: - - podinfo.iowa.weavedx.com - - podinfo - http: - - route: - - destination: - host: podinfo-primary - port: - number: 9898 - weight: 100 - - destination: - host: podinfo - port: - number: 9898 - weight: 0 diff --git a/artifacts/workloads/canary-deployment.yaml b/artifacts/workloads/canary-deployment.yaml deleted file mode 100644 index 4baf9424..00000000 --- a/artifacts/workloads/canary-deployment.yaml +++ /dev/null @@ -1,69 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: podinfo - namespace: test - labels: - app: podinfo -spec: - replicas: 1 - strategy: - rollingUpdate: - maxUnavailable: 0 - type: RollingUpdate - selector: - matchLabels: - app: podinfo - template: - metadata: - annotations: - prometheus.io/scrape: "true" - labels: - app: podinfo - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:1.7.0 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 9898 - name: http - protocol: TCP - command: - - ./podinfo - - --port=9898 - - --level=info - - --random-delay=false - - --random-error=false - env: - - name: PODINFO_UI_COLOR - value: green - livenessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/healthz - failureThreshold: 3 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 2 - readinessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/readyz - failureThreshold: 3 - periodSeconds: 3 - successThreshold: 1 - timeoutSeconds: 2 - resources: - limits: - cpu: 1000m - memory: 256Mi - requests: - cpu: 100m - memory: 16Mi diff --git a/artifacts/workloads/canary-destination.yaml b/artifacts/workloads/canary-destination.yaml deleted file mode 100644 index 761a21a7..00000000 --- a/artifacts/workloads/canary-destination.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: DestinationRule -metadata: - name: podinfo-canary - namespace: test -spec: - host: podinfo-canary - trafficPolicy: - loadBalancer: - consistentHash: - httpCookie: - name: user - ttl: 0s \ No newline at end of file diff --git a/artifacts/workloads/canary-hpa.yaml b/artifacts/workloads/canary-hpa.yaml deleted file mode 100644 index 9ffce478..00000000 --- a/artifacts/workloads/canary-hpa.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: podinfo - namespace: test -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: podinfo - minReplicas: 2 - maxReplicas: 2 - metrics: - - type: Resource - resource: - name: cpu - # scale up if usage is above - # 99% of the requested CPU (100m) - targetAverageUtilization: 99 - - type: Resource - resource: - name: memory - targetAverageValue: 200Mi diff --git a/artifacts/workloads/canary-service.yaml b/artifacts/workloads/canary-service.yaml deleted file mode 100644 index 7a09e206..00000000 --- a/artifacts/workloads/canary-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: podinfo-canary - namespace: test -spec: - type: ClusterIP - selector: - app: podinfo - ports: - - name: http - port: 9898 - protocol: TCP - targetPort: http diff --git a/artifacts/workloads/primary-deployment.yaml b/artifacts/workloads/primary-deployment.yaml deleted file mode 100644 index 6bc393a7..00000000 --- a/artifacts/workloads/primary-deployment.yaml +++ /dev/null @@ -1,71 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: podinfo-primary - namespace: test - labels: - app: podinfo-primary -spec: - replicas: 1 - strategy: - rollingUpdate: - maxUnavailable: 0 - type: RollingUpdate - selector: - matchLabels: - app: podinfo-primary - template: - metadata: - annotations: - prometheus.io/scrape: "true" - labels: - app: podinfo-primary - spec: - containers: - - name: podinfod - image: quay.io/stefanprodan/podinfo:1.7.1 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 9898 - name: http - protocol: TCP - command: - - ./podinfo - - --port=9898 - - --level=info - - --random-delay=false - - --random-error=false - env: - - name: PODINFO_UI_COLOR - value: blue - livenessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/healthz - initialDelaySeconds: 5 - failureThreshold: 3 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - readinessProbe: - exec: - command: - - podcli - - check - - http - - localhost:9898/readyz - initialDelaySeconds: 5 - failureThreshold: 3 - periodSeconds: 3 - successThreshold: 1 - timeoutSeconds: 1 - resources: - limits: - cpu: 2000m - memory: 512Mi - requests: - cpu: 10m - memory: 64Mi diff --git a/artifacts/workloads/primary-destination.yaml b/artifacts/workloads/primary-destination.yaml deleted file mode 100644 index d84b1962..00000000 --- a/artifacts/workloads/primary-destination.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: DestinationRule -metadata: - name: podinfo-primary - namespace: test -spec: - host: podinfo-primary - trafficPolicy: - loadBalancer: - consistentHash: - httpCookie: - name: user - ttl: 0s diff --git a/artifacts/workloads/primary-hpa.yaml b/artifacts/workloads/primary-hpa.yaml deleted file mode 100644 index 0b762122..00000000 --- a/artifacts/workloads/primary-hpa.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: podinfo-primary - namespace: test -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: podinfo-primary - minReplicas: 2 - maxReplicas: 2 - metrics: - - type: Resource - resource: - name: cpu - # scale up if usage is above - # 99% of the requested CPU (100m) - targetAverageUtilization: 99 diff --git a/artifacts/workloads/primary-service.yaml b/artifacts/workloads/primary-service.yaml deleted file mode 100644 index b5290e28..00000000 --- a/artifacts/workloads/primary-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: podinfo-primary - namespace: test - labels: - app: podinfo-primary -spec: - type: ClusterIP - selector: - app: podinfo-primary - ports: - - name: http - port: 9898 - protocol: TCP - targetPort: http diff --git a/artifacts/workloads/service.yaml b/artifacts/workloads/service.yaml deleted file mode 100644 index 3e98f1e0..00000000 --- a/artifacts/workloads/service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: podinfo - namespace: test -spec: - type: ClusterIP - selector: - app: podinfo-primary - ports: - - name: http - port: 9898 - protocol: TCP - targetPort: http diff --git a/artifacts/workloads/virtual-service.yaml b/artifacts/workloads/virtual-service.yaml deleted file mode 100644 index b2c59e45..00000000 --- a/artifacts/workloads/virtual-service.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: podinfo - namespace: test - labels: - app: podinfo -spec: - gateways: - - mesh - - public-gateway.istio-system.svc.cluster.local - hosts: - - podinfo - - app.istio.weavedx.com - http: - - route: - - destination: - host: podinfo-primary - weight: 50 - - destination: - host: podinfo-canary - weight: 50 - timeout: 5s