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.

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

CASMPET-7334: Add images for K8s v1.32.0 upgrade in CSM 1.7 #656

Merged
merged 1 commit into from
Jan 21, 2025

Conversation

studenym-hpe
Copy link
Contributor

@studenym-hpe studenym-hpe commented Jan 21, 2025

Summary and Scope

  • Add K8s images for upgrade to 1.32.0 in CSM 1.7:

    • registry.k8s.io/kube-apiserver:v1.32.0
    • registry.k8s.io/kube-controller-manager:v1.32.0
    • registry.k8s.io/kube-scheduler:v1.32.0
    • registry.k8s.io/kube-proxy:v1.32.0
    • registry.k8s.io/coredns/coredns:v1.11.3
    • registry.k8s.io/pause:3.10

    Versions were obtained from mercury system running POC.

  • Generating pause:3.10 yaml and Dockerfile found issue with DOCKER_TAG value in template in GNUmakefile and .github/scripts/template/workflow.yaml. Added quotes around tag so evaluated as a string and not a number.

Issues and Related PRs

Testing

Executed make add to test that quotes showed up in yaml file.

container-images % make add IMAGE=pause:3.9 REGISTRY=registry.k8s.io
docker pull registry.k8s.io/pause:3.9 > /dev/null 2>&1
make _update IMAGE=pause:3.9 REGISTRY=registry.k8s.io NAME=pause TAG=3.9 DOCKERDIR=registry.k8s.io/pause/3.9 GHACTIONFILE=registry.k8s.io.pause.3.9.yaml PACKAGE_MANAGER= TOPFLAGS="add IMAGE=pause:3.9 REGISTRY=registry.k8s.io PACKAGE_MANAGER="
install -dm755 registry.k8s.io/pause/3.9

From make generated registry.k8s.io.pause.3.9.yaml:

    env:
      CONTEXT_PATH: registry.k8s.io/pause/3.9
      DOCKER_REPO: artifactory.algol60.net/csm-docker/${{ github.ref == 'refs/heads/main' && 'stable' || 'unstable' }}/registry.k8s.io/pause
      DOCKER_TAG: "3.9"

Executed create_buildfiles.sh to test that quotes showed up in generated yaml file.

 container-images % ./.github/scripts/create_buildfiles.sh -r registry.k8s.io -i pause -t 3.9 -g workflow
Using upstream image registry.k8s.io/pause:3.9
Creating workflow .github/workflows/registry.k8s.io.pause.3.9.yaml

From script generated registry.k8s.io.pause.3.9.yaml:

    env:
      CONTEXT_PATH: registry.k8s.io/pause/3.9
      DOCKER_REPO: artifactory.algol60.net/csm-docker/${{ github.ref == 'refs/heads/main' && 'stable' || 'unstable' }}/registry.k8s.io/pause
      DOCKER_TAG: "3.9"

Pull Request Checklist

  • Version number(s) incremented, if applicable
  • Copyrights updated
  • License file intact
  • Target branch correct
  • CHANGELOG.md updated
  • Testing is appropriate and complete, if applicable
  • HPC Product Announcement prepared, if applicable

@studenym-hpe
Copy link
Contributor Author

There appears to be a problem publishing registry.k8s.io/pause:3.10. It's being published to Artifactory as registry.k8s.io/pause:3.1
image

@studenym-hpe
Copy link
Contributor Author

studenym-hpe commented Jan 21, 2025

@mtupitsyn Do you know what I need to do to fix this? Looks like registry.k8s.io/pause:3.10 is pushed to Artifactory as registry.k8s.io/pause:3.1 done here ...
https://github.com/Cray-HPE/container-images/actions/runs/12891989895/job/35945210880#:~:text=%230%20building%20with,739

This is not what is in the registry.k8s.io.pause.3.10.yaml file. It's not reading in the DOCKER_TAG: correctly.
https://github.com/Cray-HPE/container-images/actions/runs/12891989895/job/35945210880#:~:text=shell%3A%20/usr/bin,DOCKER_TAG%3A%203.1

Here is the first place in the actions output where the incorrect DOCKER_TAG is logged:

Run Cray-HPE/github-actions/build-sign-scan@build-sign-scan/v2
  with:
    context_path: registry.k8s.io/pause/[3](https://github.com/Cray-HPE/container-images/actions/runs/12891989895/job/35945210880#step:3:3).10
    docker_repo: artifactory.algol60.net/csm-docker/unstable/registry.k8s.io/pause
    docker_tag: 3.1
    docker_username: ***
    docker_password: ***
    sign: false
    cosign_gcp_workload_identity_provider: ***
    cosign_gcp_service_account: ***
    cosign_key: ***
    snyk_token: ***
    fail_on_snyk_errors: true
    docker_push: true
    snyk: true
    snyk_exclude_app_vulns: false
    snyk_severity_threshold: high
    trivy: true
    fail_on_trivy_action_vulnerabilities: false
  env:
    CONTEXT_PATH: registry.k8s.io/pause/3.10
    DOCKER_REPO: artifactory.algol[6](https://github.com/Cray-HPE/container-images/actions/runs/12891989895/job/35945210880#step:3:6)0.net/csm-docker/unstable/registry.k8s.io/pause
    DOCKER_TAG: 3.1

Put quotes around DOCKER_TAG <<TAG>> so evaluated as string
@studenym-hpe studenym-hpe force-pushed the CASMPET-7334-k8s-upgrade branch from 33bd322 to 53b9ce3 Compare January 21, 2025 20:36
@studenym-hpe studenym-hpe merged commit a622c66 into main Jan 21, 2025
5 of 7 checks passed
@studenym-hpe studenym-hpe deleted the CASMPET-7334-k8s-upgrade branch January 21, 2025 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants