Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.9 backports 2021-12-10 #18234

Merged
merged 2 commits into from
Dec 15, 2021
Merged

v1.9 backports 2021-12-10 #18234

merged 2 commits into from
Dec 15, 2021

Conversation

nbusseneau
Copy link
Member

Once this PR is merged, you can update the PR labels via:

$ for pr in 18203 18209; do contrib/backporting/set-labels.py $pr done 1.9; done

@geakstr @nbusseneau
ui: v0.8.5
85fe2b4 
[ upstream commit 7d74863 ]

Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau requested a review from a team as a code owner December 10, 2021 17:18
@nbusseneau nbusseneau added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Dec 10, 2021
@nbusseneau
Copy link
Member Author

/test-backport-1.9

@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 13, 2021 •
edited

/test-1.12-netnext

EDIT: Previous run hit provisioning issues, re-running.

@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 13, 2021 •
edited

/test-1.16-4.9

EDIT: Previous run hit provisioning issues, re-running.

@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 13, 2021 •
edited

Smoke tests failed with:

helm template cilium cilium --namespace=kube-system \
--set image.useDigest=true --set operator.image.useDigest=true --set preflight.image.useDigest=true --set hubble.relay.image.useDigest=true --set clustermesh.apiserver.image.useDigest=true --set hubble.tls.auto.enabled=true --set hubble.tls.auto.method="cronJob" --set hubble.metrics.enabled="{dns,drop,tcp,flow,icmp,http}" --set hubble.relay.enabled=true --set hubble.ui.enabled=true --set localRedirectPolicy=true --set bandwidthManager=true --set operator.replicas=1 > "/home/runner/work/cilium/cilium/install/kubernetes/experimental-install.yaml"
make: Leaving directory '/home/runner/work/cilium/cilium/install/kubernetes'
diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml
index 0008b5e..75e6048 100644
--- a/install/kubernetes/cilium/values.yaml
+++ b/install/kubernetes/cilium/values.yaml
@@ -637,7 +637,7 @@ hubble:
       # -- Hubble-ui backend image.
       image:
         repository: quay.io/cilium/hubble-ui-backend
-        tag: v0.7.9@sha256:632c938ef6ff30e3a080c59b734afb1fb7493689275443faa1435f7141aabe76
+        tag: v0.8.5@sha256:2bce50cf6c32719d072706f7ceccad654bfa907b2745a496da99610776fe31ed
         pullPolicy: IfNotPresent
       # [Example]
       # resources:
@@ -654,7 +654,7 @@ hubble:
       # -- Hubble-ui frontend image.
       image:
         repository: quay.io/cilium/hubble-ui
-        tag: v0.7.9@sha256:e0e461c680ccd083ac24fe4f9e19e675422485f04d8720635ec41f2ba9e5562c
+        tag: v0.8.5@sha256:4eaca1ec1741043cfba6066a165b3bf251590cf4ac66371c4f63fbed2224ebb4
         pullPolicy: IfNotPresent
       # [Example]
       # resources:
diff --git a/install/kubernetes/experimental-install.yaml b/install/kubernetes/experimental-install.yaml
index 0c1a7c6..21a415f 100644
--- a/install/kubernetes/experimental-install.yaml
+++ b/install/kubernetes/experimental-install.yaml
@@ -1170,7 +1170,7 @@ spec:
       serviceAccountName: hubble-ui
       containers:
         - name: frontend
-          image: "quay.io/cilium/hubble-ui:v0.7.9@sha256:e0e461c680ccd083ac24fe4f9e19e675422485f04d8720635ec41f2ba9e5562c"
+          image: "quay.io/cilium/hubble-ui:v0.8.5@sha256:4eaca1ec1741043cfba6066a165b3bf251590cf4ac66371c4f63fbed2224ebb4"
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -1178,7 +1178,7 @@ spec:
           resources:
             {}
         - name: backend
-          image: "quay.io/cilium/hubble-ui-backend:v0.7.9@sha256:632c938ef6ff30e3a080c59b734afb1fb7493689275443faa1435f7141aabe76"
+          image: "quay.io/cilium/hubble-ui-backend:v0.8.5@sha256:2bce50cf6c32719d072706f7ceccad654bfa907b2745a496da99610776fe31ed"
           imagePullPolicy: IfNotPresent
           env:
             - name: EVENTS_SERVER_PORT
please run 'make -C install/kubernetes experimental-install' and submit your changes

This is a legitimate issue coming from the PR, need to run make -C install/kubernetes to fix.

@joestringer @nbusseneau
install: Fix hubble-ui image references
2a35af6 
[ upstream commit 701967f ]

[ Backport notes: ran `make -C install/kubernetes`, bundling other
  changes in the commit. ]

The variable was not enclosed fully in speechmarks, observed by seeing
failures in `make -C install/kubernetes` while backporting this to older
branches.

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau
Copy link
Member Author

nbusseneau commented Dec 13, 2021 •
edited

Manual links to re-runs of failed pipelines from above:

joestringer
joestringer approved these changes Dec 13, 2021
View reviewed changes
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Yeah on master we don't track the shas directly in the values file, readme etc. so those changes were unnecessary there. This is one of those few cases where we just need to run an extra command to get the backport to work correctly.

@nbusseneau
Copy link
Member Author

CI passed, merging.

@nbusseneau nbusseneau added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 15, 2021
@nbusseneau nbusseneau merged commit d5ff3f7 into cilium:v1.9 Dec 15, 2021
@joestringer joestringer mentioned this pull request Jan 18, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joestringer joestringer joestringer approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nbusseneau @joestringer @geakstr