From 20eed7b4b68d217c69f268abf1e026a291210def Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Thu, 24 Oct 2024 13:59:41 -0700 Subject: [PATCH 1/3] Bump proxy version to 13.7 --- .../deploy/kubernetes/6-wavefront-proxy.yaml | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml index 1bd2dca31..59f2502ef 100644 --- a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml +++ b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml @@ -2,11 +2,13 @@ apiVersion: apps/v1 kind: Deployment metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: "" labels: - app: wavefront-proxy - name: wavefront-proxy + app.kubernetes.io/component: controller-manager + app.kubernetes.io/name: wavefront name: wavefront-proxy - namespace: default + namespace: observability-system spec: replicas: 1 selector: @@ -22,25 +24,25 @@ spec: key: kubernetes.io/arch value: arm64 containers: - - name: wavefront-proxy - image: wavefronthq/proxy:13.7 - imagePullPolicy: IfNotPresent - env: - - name: WAVEFRONT_URL - value: https://YOUR_CLUSTER.wavefront.com/api/ - - name: WAVEFRONT_TOKEN - value: YOUR_API_TOKEN - # Uncomment the below lines to consume Zipkin/Istio traces - #- name: WAVEFRONT_PROXY_ARGS - # value: --traceZipkinListenerPorts 9411 - ports: - - containerPort: 2878 - protocol: TCP - # Uncomment the below lines to consume Zipkin/Istio traces - #- containerPort: 9411 - # protocol: TCP - securityContext: - privileged: false + - name: wavefront-proxy + image: wavefronthq/proxy:13.7 + imagePullPolicy: IfNotPresent + env: + - name: WAVEFRONT_URL + value: https://YOUR_CLUSTER.wavefront.com/api/ + - name: WAVEFRONT_TOKEN + value: YOUR_API_TOKEN + # Uncomment the below lines to consume Zipkin/Istio traces + #- name: WAVEFRONT_PROXY_ARGS + # value: --traceZipkinListenerPorts 9411 + ports: + - containerPort: 2878 + protocol: TCP + # Uncomment the below lines to consume Zipkin/Istio traces + #- containerPort: 9411 + # protocol: TCP + securityContext: + privileged: false --- apiVersion: v1 kind: Service @@ -51,9 +53,9 @@ metadata: namespace: default spec: ports: - - name: wavefront - port: 2878 - protocol: TCP + - name: wavefront + port: 2878 + protocol: TCP # Uncomment the below lines to consume Zipkin/Istio traces #- name: http # port: 9411 From 5d48255263c3e8817a6339125b8b2fc43fffb65d Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Thu, 24 Oct 2024 20:20:23 -0700 Subject: [PATCH 2/3] file update --- .../deploy/kubernetes/6-wavefront-proxy.yaml | 12 ++-- deploy/scenarios/wavefront-proxy-version.yaml | 65 +++++++++++++++++++ 2 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 deploy/scenarios/wavefront-proxy-version.yaml diff --git a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml index b4e8cb3f1..330d25609 100644 --- a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml +++ b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml @@ -2,13 +2,11 @@ apiVersion: apps/v1 kind: Deployment metadata: - annotations: - kubectl.kubernetes.io/last-applied-configuration: "" labels: - app.kubernetes.io/component: controller-manager - app.kubernetes.io/name: wavefront + app: wavefront-proxy + name: wavefront-proxy name: wavefront-proxy - namespace: observability-system + namespace: default spec: replicas: 1 selector: @@ -25,7 +23,7 @@ spec: value: arm64 containers: - name: wavefront-proxy - image: wavefronthq/proxy:13.7 + image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 imagePullPolicy: IfNotPresent env: - name: WAVEFRONT_URL @@ -63,4 +61,4 @@ spec: # targetPort: 9411 # protocol: TCP selector: - app: wavefront-proxy + app: wavefront-proxy \ No newline at end of file diff --git a/deploy/scenarios/wavefront-proxy-version.yaml b/deploy/scenarios/wavefront-proxy-version.yaml new file mode 100644 index 000000000..59f2502ef --- /dev/null +++ b/deploy/scenarios/wavefront-proxy-version.yaml @@ -0,0 +1,65 @@ +# Need to change YOUR_CLUSTER and YOUR_API_TOKEN accordingly +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kubectl.kubernetes.io/last-applied-configuration: "" + labels: + app.kubernetes.io/component: controller-manager + app.kubernetes.io/name: wavefront + name: wavefront-proxy + namespace: observability-system +spec: + replicas: 1 + selector: + matchLabels: + app: wavefront-proxy + template: + metadata: + labels: + app: wavefront-proxy + spec: + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + value: arm64 + containers: + - name: wavefront-proxy + image: wavefronthq/proxy:13.7 + imagePullPolicy: IfNotPresent + env: + - name: WAVEFRONT_URL + value: https://YOUR_CLUSTER.wavefront.com/api/ + - name: WAVEFRONT_TOKEN + value: YOUR_API_TOKEN + # Uncomment the below lines to consume Zipkin/Istio traces + #- name: WAVEFRONT_PROXY_ARGS + # value: --traceZipkinListenerPorts 9411 + ports: + - containerPort: 2878 + protocol: TCP + # Uncomment the below lines to consume Zipkin/Istio traces + #- containerPort: 9411 + # protocol: TCP + securityContext: + privileged: false +--- +apiVersion: v1 +kind: Service +metadata: + name: wavefront-proxy + labels: + app: wavefront-proxy + namespace: default +spec: + ports: + - name: wavefront + port: 2878 + protocol: TCP + # Uncomment the below lines to consume Zipkin/Istio traces + #- name: http + # port: 9411 + # targetPort: 9411 + # protocol: TCP + selector: + app: wavefront-proxy From f37364db2adb4da96c353c56043235a97e364118 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Thu, 24 Oct 2024 20:23:05 -0700 Subject: [PATCH 3/3] revert file --- .../deploy/kubernetes/6-wavefront-proxy.yaml | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml index 330d25609..1bd2dca31 100644 --- a/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml +++ b/collector/hack/deploy/kubernetes/6-wavefront-proxy.yaml @@ -22,26 +22,25 @@ spec: key: kubernetes.io/arch value: arm64 containers: - - name: wavefront-proxy - image: projects.registry.vmware.com/tanzu_observability/proxy:13.4 - imagePullPolicy: IfNotPresent - env: - - name: WAVEFRONT_URL - value: https://YOUR_CLUSTER.wavefront.com/api/ - - name: WAVEFRONT_TOKEN - value: YOUR_API_TOKEN - # Uncomment the below lines to consume Zipkin/Istio traces - #- name: WAVEFRONT_PROXY_ARGS - # value: --traceZipkinListenerPorts 9411 - ports: - - containerPort: 2878 - protocol: TCP - # Uncomment the below lines to consume Zipkin/Istio traces - #- containerPort: 9411 - # protocol: TCP - securityContext: - privileged: false - + - name: wavefront-proxy + image: wavefronthq/proxy:13.7 + imagePullPolicy: IfNotPresent + env: + - name: WAVEFRONT_URL + value: https://YOUR_CLUSTER.wavefront.com/api/ + - name: WAVEFRONT_TOKEN + value: YOUR_API_TOKEN + # Uncomment the below lines to consume Zipkin/Istio traces + #- name: WAVEFRONT_PROXY_ARGS + # value: --traceZipkinListenerPorts 9411 + ports: + - containerPort: 2878 + protocol: TCP + # Uncomment the below lines to consume Zipkin/Istio traces + #- containerPort: 9411 + # protocol: TCP + securityContext: + privileged: false --- apiVersion: v1 kind: Service @@ -52,13 +51,13 @@ metadata: namespace: default spec: ports: - - name: wavefront - port: 2878 - protocol: TCP + - name: wavefront + port: 2878 + protocol: TCP # Uncomment the below lines to consume Zipkin/Istio traces #- name: http # port: 9411 # targetPort: 9411 # protocol: TCP selector: - app: wavefront-proxy \ No newline at end of file + app: wavefront-proxy