Skip to content

USHIFT-552: Rebase with K8s 1.26 #1319

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

Merged
openshift-merge-robot merged 17 commits into from
Feb 8, 2023
Merged

USHIFT-552: Rebase with K8s 1.26 #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
36b4137
Update patches to match K8s 1.26
pmtk Feb 3, 2023
89620c9
update go.{mod,sum}
pmtk Feb 3, 2023
68353ee
update vendor/
pmtk Feb 3, 2023
f017896
Update component images
pmtk Feb 3, 2023
0c98a6f
update assets/
pmtk Feb 3, 2023
07e1004
Update Makefile.kube_git.var
pmtk Feb 3, 2023
ef0326d
update microshift/go.mod
pmtk Feb 7, 2023
5563e55
update microshift/vendor
pmtk Feb 7, 2023
f7f2711
update etcd/go.mod
pmtk Feb 7, 2023
f6c0b7b
update etcd/vendor
pmtk Feb 7, 2023
2fae07f
update component images
pmtk Feb 7, 2023
71b77e6
update manifests
pmtk Feb 7, 2023
dc0249d
update buildfiles
pmtk Feb 7, 2023
db2ea26
update changelog
pmtk Feb 7, 2023
cc1a6a6
reduce verbosity of lvms manifest copy
pmtk Feb 7, 2023
9aac1ee
remove deprecated flag
pmtk Feb 7, 2023
795b515
install Go1.19 along with one from repositories
pmtk Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=25
KUBE_GIT_VERSION=v1.25.0
KUBE_GIT_COMMIT=7dab57f2302ec0f94b648ccb48b0fa67c2befbb3
KUBE_GIT_MINOR=26
KUBE_GIT_VERSION=v1.26.0
KUBE_GIT_COMMIT=9eb81c20e0fde9d068ed83e58c8fc870412958a9
KUBE_GIT_TREE_STATE=clean
16 changes: 8 additions & 8 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-01-30-010253"
"base": "4.13.0-0.nightly-arm64-2023-02-06-181757"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:865249ca55da5d54bdba01321bad7c03f738d23cf9533d3724cb6a705c1a7f8c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4af574e5ff2866d99c98b579ef3fdef0511c6a80343cf09da80ba7bf460ab30e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2746cf3272b28f3479aace4f9ede7f54ada64dd3168fdd708239937f10ac933f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a16663e3c4547af28738a8690bf3f9eb5b7e41bde92a0fd2008b9254c87b09b9",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730f06acfdffcaabf42bfc21adf97d657048adfa8062b82b8c4dfb88254c6873",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25318c287e5db1051a68b8a54976ef5b6175432d33878d3e4055fb2d55d36242",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81596654ec4bfdc8bee03b9fccb3cdc5e64aba79f2eda7824ea7235c3a80481e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de0d0281d188ae9a3c2203b775108fead5c432374c817517d7ef4d405a764bff",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:534258847105e616f856f6a703b9e1ec622dbc2d3541efbb069e7f656d5a23a4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:467984e3d3f19740278e95b3928ba2239571ca134896944dc160039451f262c2",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ddea0c30e6facf46d52015482a7f0914a8ec0182cff3f0d5ec4a4f6035114e8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e744995de1a0bcf5bb3f335f1d0f2b5ce7ed0761a4649dd9229f841571e26eff",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c0abe967b7639b0e608043f7ce8867e2e904b165963e3b2fa6e7ac526ee2014",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55b0d63c0d0959de7e09be5e5f52b4f76ff34210530ca010412b2e326053015b",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
16 changes: 8 additions & 8 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-01-27-165107"
"base": "4.13.0-0.nightly-2023-02-06-181754"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73647fa8da0b0b3df908d4aa51754b47d915f745654ae59c98530545409f81d8",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78b1abd5a5d064d6e7c99a3395eb004c962c87f35536e42b16fbd3a4040154c3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3cb7a592e8c7e32a0c1ea4eeeb366afe5f6475038fde79083b08b0dafc31d5f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c81868ca6e1c5179cd8d1d90fe343e9c677c577a8b0b08cf865b9be3f154968",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b8e26d6e61999214795d35054335bd69fc4e384729c449a1eab93b140874693",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6ef674aa672d1b4205e58650810ffc8d7a57108d8d6f36fa56f1f6175bf4798",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44972036a5f346622c80746575f40d9dbd8a20c01f34876061f6478f2233fb4a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66dc04a0fe9251f16d04fce27cf411cf699764224b01110e95d0fbc98de327b7",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e583d857aca165fa524bc6486f70aec7572b483e12f539a60e6f5f60566c79e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:566c0838998b1dd8464b43dbe2150b78fcbb83262ea7d25d41c85acb1a33e31c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2527145d783ab9ac0428e878e8d318d8f9b1627c707ff02f15fd70ccef7487c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce3d5675adfbd47e5c612bf54dae441492be7839879c4bd11dd8150521c74fda",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f5975425afdab34ca9e80a7e192c64e7b653a7ab53ddb135719c922b39c90e9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:386a51b756c0d62319fe921ef20504c2649eb79d954846fbcd9df120eea469ca",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
27 changes: 20 additions & 7 deletions docs/devenv_setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Start by downloading one of the supported boot images for the `x86_64` or `aarch
* CentOS 9 Stream from https://www.centos.org/download

### Creating VM
Create a RHEL virtual machine with 2 cores, 4096MB of RAM and 50GB of storage.
Create a RHEL virtual machine with 2 cores, 4096MB of RAM and 50GB of storage.
> Visual Studio Code may consume around 2GB of RAM. For running the IDE on the development virtual machine, it is recommended to allocate at least 6144MB of RAM in total.

Install the `libvirt` packages and reboot your system to start the virtualization environment.
Expand Down Expand Up @@ -65,10 +65,23 @@ sudo dnf clean all -y
sudo dnf update -y
sudo dnf install -y git cockpit make golang selinux-policy-devel rpm-build bash-completion
sudo systemctl enable --now cockpit.socket

# Install go1.19
# This is installed into different location (/usr/local/bin/go) from dnf installed Go (/usr/bin/go) so it doesn't conflict
# /usr/local/bin is before /usr/bin in $PATH so newer one is picked up
GO_VER=1.19.4
GO_ARCH=$([ "$(uname -i)" == "x86_64" ] && echo "amd64" || echo "arm64")
curl -L -o "go${GO_VER}.linux-${GO_ARCH}.tar.gz" "https://go.dev/dl/go${GO_VER}.linux-${GO_ARCH}.tar.gz" &&
sudo rm -rf "/usr/local/go${GO_VER}" && \
sudo mkdir -p "/usr/local/go${GO_VER}" && \
sudo tar -C "/usr/local/go${GO_VER}" -xzf "go${GO_VER}.linux-${GO_ARCH}.tar.gz" --strip-components 1 && \
sudo rm -rfv /usr/local/bin/{go,gofmt} && \
sudo ln --symbolic /usr/local/go${GO_VER}/bin/{go,gofmt} /usr/local/bin/ && \
rm -rfv "go${GO_VER}.linux-${GO_ARCH}.tar.gz"
```
You should now be able to access the VM Cockpit console using `https://<vm_ip>:9090` URL.

## Build MicroShift
## Build MicroShift
Log into the development virtual machine with the `microshift` user credentials.
Clone the repository to be used for building various artifacts.
```bash
Expand All @@ -85,7 +98,7 @@ make
The artifact of the build is the `microshift` executable file located in the `_output/bin` directory.

### RPM Packages
Run make command with the `rpm` or `srpm` argument in the top-level directory.
Run make command with the `rpm` or `srpm` argument in the top-level directory.
```bash
make rpm
make srpm
Expand Down Expand Up @@ -113,7 +126,7 @@ When working with MicroShift based on a pre-release _minor_ version `Y` of OpenS

```bash
OSVERSION=$(awk -F: '{print $5}' /etc/system-release-cpe)

sudo subscription-manager config --rhsm.manage_repos=1
sudo subscription-manager repos \
--enable rhocp-4.12-for-rhel-${OSVERSION}-$(uname -i)-rpms \
Expand Down Expand Up @@ -222,7 +235,7 @@ watch oc get pods -A
Run the following command to stop the MicroShift process and make sure it is shut down by examining its log file.
```bash
sudo kill microshift && sleep 3
tail -3 /tmp/microshift.log
tail -3 /tmp/microshift.log
```
> If MicroShift is running as a service, it is necessary to execute the `sudo systemctl stop microshift` command to shut it down and review the output of the `journalctl -xu microshift` command to verify the service termination.

Expand All @@ -234,7 +247,7 @@ echo 1 | ~/microshift/hack/cleanup.sh
> Run the `sudo /usr/bin/configure-ovs.sh` command to revert to the original network settings.

## Quick Development and Edge Testing Cycle
During the development cycle, it is practical to build and run MicroShift executable as demonstrated in the [Build MicroShift](#build-microshift) and [Run MicroShift Executable](#run-microshift-executable) sections above. However, it is also necessary to have a convenient technique for testing the system in a setup resembling the production environment. Such an environment can be created in a virtual machine as described in the [Install MicroShift on RHEL for Edge](./rhel4edge_iso.md) document.
During the development cycle, it is practical to build and run MicroShift executable as demonstrated in the [Build MicroShift](#build-microshift) and [Run MicroShift Executable](#run-microshift-executable) sections above. However, it is also necessary to have a convenient technique for testing the system in a setup resembling the production environment. Such an environment can be created in a virtual machine as described in the [Install MicroShift on RHEL for Edge](./rhel4edge_iso.md) document.

Once a RHEL for Edge virtual machine is created, it is running a version of MicroShift with the latest changes. When MicroShift code is updated and the executable file is rebuilt with the new changes, the updates need to be installed on RHEL for Edge OS.

Expand All @@ -249,7 +262,7 @@ sudo rpm-ostree usroverlay
This would enable a development mode where users can overwrite `/usr` directory contents. Note that all changes will be discarded on reboot.

### Updating MicroShift Executable
Log into the development virtual machine with the `microshift` user credentials.
Log into the development virtual machine with the `microshift` user credentials.

It is recommended to update the local `/etc/hosts` to resolve the `microshift-edge` host name. Also, generate local SSH keys and allow the `microshift` user to run SSH commands without the password on the RHEL for Edge machine.
```bash
Expand Down
Loading