Merge branch 'dev-v2.8' into move-to-k8s-v1.27

.github/pull_request_template.md

@@ -23,4 +23,4 @@
 <!-- Dedicated section to specifically call out any areas that with higher chance of regressions caused by this change, include estimation of probability of regressions -->
 
 ## Backporting considerations
-<!-- Does this change need to be backported to other versions? If so, which versions should it be backported to? -->
+<!-- Does this change need to be backported to other versions? If so, which versions should it be backported to? -->

.github/workflows/pull-request.yaml

@@ -28,8 +28,24 @@ jobs:
       - name: Run Hull tests
         run: cd tests && go test -v ./...
 
+  check-images:
+    name: Check Container Images
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
       - name: Check container images 
         run: make check-images
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+  check-rc:
+    name: Check RC Images and Charts
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Check RC images and charts
+        run: make check-rc
+        if: startsWith(github.ref, 'refs/heads/release-v')

.github/workflows/require-checklist.yaml

@@ -0,0 +1,26 @@
+name: Require Checklist
+
+on:
+  pull_request_target:
+    branches:
+      - dev-v*
+      - release-v*
+
+jobs:
+  review-checklist:
+    name: Make validation comment on PR
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Make validation comment
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `## Validation steps
+              - [ ] Ensure any new images have repository and tag on the same level to ensure the rancher-images.txt is generated correctly for it for airgap scenarios.`,
+            })

.github/workflows/tasks-check.yaml

@@ -0,0 +1,18 @@
+name: Tasks Check
+
+on:
+  pull_request_review:
+    types: 
+      - submitted
+      - approved
+
+jobs:
+  checkbox-check:
+    if: startsWith(github.event.pull_request.base.ref, 'dev-v') || startsWith(github.event.pull_request.base.ref, 'release-v')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check checkboxes
+      uses: mheap/require-checklist-action@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        requireChecklist: true

Makefile

@@ -10,7 +10,7 @@ forward-port:
 check-release-yaml:
 	./scripts/check-release-yaml
 
-TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync check-images
+TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync check-images check-rc
 
 $(TARGETS):
 	@./scripts/pull-scripts

charts/fleet-agent/103.1.0+up0.9.0-rc.2/Chart.yaml → charts/fleet-agent/103.1.0+up0.9.0-rc.3/Chart.yaml

@@ -8,8 +8,8 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
   catalog.cattle.io/release-name: fleet-agent
 apiVersion: v2
-appVersion: 0.9.0-rc.2
+appVersion: 0.9.0-rc.3
 description: Fleet Manager Agent - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-agent
-version: 103.1.0+up0.9.0-rc.2
+version: 103.1.0+up0.9.0-rc.3

charts/fleet-agent/103.1.0+up0.9.0-rc.2/templates/rbac.yaml → charts/fleet-agent/103.1.0+up0.9.0-rc.3/templates/rbac.yaml

@@ -9,7 +9,10 @@ rules:
   - '*'
   verbs:
   - '*'
-
+- nonResourceURLs:
+  - "*"
+  verbs:
+  - "*"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/fleet-agent/103.1.0+up0.9.0-rc.2/values.yaml → charts/fleet-agent/103.1.0+up0.9.0-rc.3/values.yaml

@@ -1,7 +1,7 @@
 image:
   os: "windows,linux"
   repository: rancher/fleet-agent
-  tag: v0.9.0-rc.2
+  tag: v0.9.0-rc.3
 
 # The public URL of the Kubernetes API server running the Fleet Manager must be set here
 # Example: https://example.com:6443

charts/fleet-crd/103.1.0+up0.9.0-rc.2/Chart.yaml → charts/fleet-crd/103.1.0+up0.9.0-rc.3/Chart.yaml

@@ -6,8 +6,8 @@ annotations:
   catalog.cattle.io/permits-os: linux,windows
   catalog.cattle.io/release-name: fleet-crd
 apiVersion: v2
-appVersion: 0.9.0-rc.2
+appVersion: 0.9.0-rc.3
 description: Fleet Manager CustomResourceDefinitions
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet-crd
-version: 103.1.0+up0.9.0-rc.2
+version: 103.1.0+up0.9.0-rc.3

charts/fleet/103.1.0+up0.9.0-rc.2/Chart.yaml → charts/fleet/103.1.0+up0.9.0-rc.3/Chart.yaml

@@ -11,12 +11,12 @@ annotations:
   catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
   catalog.cattle.io/release-name: fleet
 apiVersion: v2
-appVersion: 0.9.0-rc.2
+appVersion: 0.9.0-rc.3
 dependencies:
 - condition: gitops.enabled
   name: gitjob
   repository: file://./charts/gitjob
 description: Fleet Manager - GitOps at Scale
 icon: https://charts.rancher.io/assets/logos/fleet.svg
 name: fleet
-version: 103.1.0+up0.9.0-rc.2
+version: 103.1.0+up0.9.0-rc.3

charts/fleet/103.1.0+up0.9.0-rc.2/charts/gitjob/Chart.yaml → charts/fleet/103.1.0+up0.9.0-rc.3/charts/gitjob/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.86
+appVersion: 0.1.87
 description: Controller that run jobs based on git events
 name: gitjob
-version: 0.1.86
+version: 0.1.87

charts/fleet/103.1.0+up0.9.0-rc.2/charts/gitjob/values.yaml → charts/fleet/103.1.0+up0.9.0-rc.3/charts/gitjob/values.yaml

@@ -1,6 +1,6 @@
 gitjob:
   repository: rancher/gitjob
-  tag: v0.1.86
+  tag: v0.1.87
 
 global:
   cattle:

charts/fleet/103.1.0+up0.9.0-rc.2/values.yaml → charts/fleet/103.1.0+up0.9.0-rc.3/values.yaml

@@ -1,11 +1,11 @@
 image:
   repository: rancher/fleet
-  tag: v0.9.0-rc.2
+  tag: v0.9.0-rc.3
   imagePullPolicy: IfNotPresent
 
 agentImage:
   repository: rancher/fleet-agent
-  tag: v0.9.0-rc.2
+  tag: v0.9.0-rc.3
   imagePullPolicy: IfNotPresent
 
 # For cluster registration the public URL of the Kubernetes API server must be set here

charts/harvester-cloud-provider/103.0.0+up0.1.14/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/harvester-cloud-provider/103.0.0+up0.1.14/Chart.yaml

@@ -0,0 +1,22 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: Harvester Cloud Provider
+  catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.28.0-0'
+  catalog.cattle.io/namespace: kube-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux
+  catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
+  catalog.cattle.io/release-name: harvester-cloud-provider
+  catalog.cattle.io/ui-component: harvester-cloud-provider
+  catalog.cattle.io/upstream-version: 0.1.14
+apiVersion: v2
+appVersion: v0.1.5
+description: A Helm chart for Harvester Cloud Provider
+keywords:
+- infrastructure
+- harvester
+maintainers:
+- name: harvester
+name: harvester-cloud-provider
+type: application
+version: 103.0.0+up0.1.14

charts/harvester-cloud-provider/103.0.0+up0.1.14/ci/kind-values.yaml

@@ -0,0 +1,3 @@
+replicasCount: 1
+# It's an existent but invalid kubeconfig, just for helm installation testing in kind
+cloudConfigPath: "/etc/kubernetes/admin.conf"

charts/harvester-cloud-provider/103.0.0+up0.1.14/questions.yml

@@ -0,0 +1,11 @@
+categories:
+- infrastructure
+- harvester
+namespace: kube-system
+questions:
+- variable: cloudConfigPath
+  label: Cloud config file path
+  description: "Specify the path of the cloud config."
+  group: "Default"
+  type: string
+  default: "/etc/kubernetes/cloud-config"

charts/harvester-cloud-provider/103.0.0+up0.1.14/templates/_helpers.tpl

@@ -0,0 +1,69 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "harvester-cloud-provider.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "harvester-cloud-provider.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "harvester-cloud-provider.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "harvester-cloud-provider.labels" -}}
+helm.sh/chart: {{ include "harvester-cloud-provider.chart" . }}
+{{ include "harvester-cloud-provider.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "harvester-cloud-provider.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "harvester-cloud-provider.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "harvester-cloud-provider.serviceAccountName" -}}
+{{- default (include "harvester-cloud-provider.fullname" .) .Values.serviceAccount.name }}
+{{- end }}
+
+{{/*
+Global system default registry
+*/}}
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}

charts/harvester-cloud-provider/103.0.0+up0.1.14/templates/deployment.yaml

@@ -0,0 +1,53 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+  {{- include "harvester-cloud-provider.labels" . | nindent 4 }}
+  name: {{ include "harvester-cloud-provider.name" . }}
+spec:
+  replicas: {{ .Values.replicasCount}}
+  selector:
+    matchLabels:
+  {{- include "harvester-cloud-provider.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+    {{- include "harvester-cloud-provider.selectorLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ include "harvester-cloud-provider.name" . }}
+      hostNetwork: true
+      containers:
+        - name: {{ include "harvester-cloud-provider.name" . }}
+          image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          args:
+            - --cloud-config=/etc/kubernetes/cloud-config
+            {{- if ne .Values.global.cattle.clusterName "" }}
+            - --cluster-name={{ .Values.global.cattle.clusterName }}
+          {{- end }}
+          command:
+            - harvester-cloud-provider
+          resources:
+          {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - mountPath: /etc/kubernetes/cloud-config
+              name: cloud-config
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+        - name: cloud-config
+          hostPath:
+            path: {{ required "A valid cloudConfigPath is required!" .Values.cloudConfigPath }}
+            type: File