From b7a9947c2fabcbca41eab31e0d88fb19e959d51d Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 11 Jan 2021 14:34:09 +0000 Subject: [PATCH] Remove manifests for Kubernetes 1.6 and 1.7 They are ancient history; reduce maintenance load by removing --- bin/release | 30 --- prog/weave-kube/weave-daemonset-k8s-1.6.yaml | 181 ---------------- prog/weave-kube/weave-daemonset-k8s-1.7.yaml | 200 ------------------ ...vers_unreachable_ips_on_relaunch_3_test.sh | 2 +- 4 files changed, 1 insertion(+), 412 deletions(-) delete mode 100644 prog/weave-kube/weave-daemonset-k8s-1.6.yaml delete mode 100644 prog/weave-kube/weave-daemonset-k8s-1.7.yaml diff --git a/bin/release b/bin/release index 243c2480..00cf24ef 100755 --- a/bin/release +++ b/bin/release @@ -89,8 +89,6 @@ build() { ## Inject the version numbers and build the distributables ## (library versions?) sed -i.bak "/SCRIPT_VERSION=/ c\SCRIPT_VERSION=\"$VERSION\"" ./weave - sed -i.bak -e "s/:latest/:$VERSION/" -e "/imagePullPolicy: Always/d" ./prog/weave-kube/weave-daemonset-k8s-1.6.yaml - sed -i.bak -e "s/:latest/:$VERSION/" -e "/imagePullPolicy: Always/d" ./prog/weave-kube/weave-daemonset-k8s-1.7.yaml sed -i.bak -e "s/:latest/:$VERSION/" -e "/imagePullPolicy: Always/d" ./prog/weave-kube/weave-daemonset-k8s-1.8.yaml sed -i.bak -e "s/:latest/:$VERSION/" -e "/imagePullPolicy: Always/d" ./prog/weave-kube/weave-daemonset-k8s-1.9.yaml sed -i.bak -e "s/:latest/:$VERSION/" -e "/imagePullPolicy: Always/d" ./prog/weave-kube/weave-daemonset-k8s-1.11.yaml @@ -162,20 +160,6 @@ draft() { --name "weave" \ --file "./weave" - github-release upload \ - --user $GITHUB_USER \ - --repo weave \ - --tag $LATEST_TAG \ - --name "weave-daemonset-k8s-1.6.yaml" \ - --file "./prog/weave-kube/weave-daemonset-k8s-1.6.yaml" - - github-release upload \ - --user $GITHUB_USER \ - --repo weave \ - --tag $LATEST_TAG \ - --name "weave-daemonset-k8s-1.7.yaml" \ - --file "./prog/weave-kube/weave-daemonset-k8s-1.7.yaml" - github-release upload \ --user $GITHUB_USER \ --repo weave \ @@ -284,20 +268,6 @@ publish() { --name "weave" \ --file "./weave" - github-release upload \ - --user $GITHUB_USER \ - --repo weave \ - --tag latest_release \ - --name "weave-daemonset-k8s-1.6.yaml" \ - --file "./prog/weave-kube/weave-daemonset-k8s-1.6.yaml" - - github-release upload \ - --user $GITHUB_USER \ - --repo weave \ - --tag latest_release \ - --name "weave-daemonset-k8s-1.7.yaml" \ - --file "./prog/weave-kube/weave-daemonset-k8s-1.7.yaml" - github-release upload \ --user $GITHUB_USER \ --repo weave \ diff --git a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml b/prog/weave-kube/weave-daemonset-k8s-1.6.yaml deleted file mode 100644 index 1439a669..00000000 --- a/prog/weave-kube/weave-daemonset-k8s-1.6.yaml +++ /dev/null @@ -1,181 +0,0 @@ -apiVersion: v1 -kind: List -items: - - apiVersion: v1 - kind: ServiceAccount - metadata: - name: weave-net - labels: - name: weave-net - namespace: kube-system - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: ClusterRole - metadata: - name: weave-net - labels: - name: weave-net - rules: - - apiGroups: - - '' - resources: - - pods - - namespaces - - nodes - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - networkpolicies - verbs: - - get - - list - - watch - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: ClusterRoleBinding - metadata: - name: weave-net - labels: - name: weave-net - roleRef: - kind: ClusterRole - name: weave-net - apiGroup: rbac.authorization.k8s.io - subjects: - - kind: ServiceAccount - name: weave-net - namespace: kube-system - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: Role - metadata: - name: weave-net-kube-peer - namespace: kube-system - labels: - name: weave-net-kube-peer - rules: - - apiGroups: - - '' - resources: - - configmaps - resourceNames: - - weave-net - verbs: - - get - - update - - apiGroups: - - '' - resources: - - configmaps - verbs: - - create - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: RoleBinding - metadata: - name: weave-net-kube-peer - namespace: kube-system - labels: - name: weave-net-kube-peer - roleRef: - kind: Role - name: weave-net-kube-peer - apiGroup: rbac.authorization.k8s.io - subjects: - - kind: ServiceAccount - name: weave-net - namespace: kube-system - - apiVersion: extensions/v1beta1 - kind: DaemonSet - metadata: - name: weave-net - labels: - name: weave-net - namespace: kube-system - spec: - template: - metadata: - labels: - name: weave-net - spec: - containers: - - name: weave - command: - - /home/weave/launch.sh - env: - - name: HOSTNAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - image: 'weaveworks/weave-kube:latest' - imagePullPolicy: Always - readinessProbe: - httpGet: - host: 127.0.0.1 - path: /status - port: 6784 - resources: - requests: - cpu: 50m - securityContext: - privileged: true - volumeMounts: - - name: weavedb - mountPath: /weavedb - - name: cni-bin - mountPath: /host/opt - - name: cni-bin2 - mountPath: /host/home - - name: cni-conf - mountPath: /host/etc - - name: dbus - mountPath: /host/var/lib/dbus - - name: lib-modules - mountPath: /lib/modules - - name: weave-npc - env: - - name: HOSTNAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:latest' - imagePullPolicy: Always - resources: - requests: - cpu: 50m - securityContext: - privileged: true - hostNetwork: true - hostPID: false - restartPolicy: Always - securityContext: - seLinuxOptions: {} - serviceAccountName: weave-net - tolerations: - - effect: NoSchedule - operator: Exists - - effect: NoExecute - operator: Exists - volumes: - - name: weavedb - hostPath: - path: /var/lib/weave - - name: cni-bin - hostPath: - path: /opt - - name: cni-bin2 - hostPath: - path: /home - - name: cni-conf - hostPath: - path: /etc - - name: dbus - hostPath: - path: /var/lib/dbus - - name: lib-modules - hostPath: - path: /lib/modules - updateStrategy: - type: RollingUpdate diff --git a/prog/weave-kube/weave-daemonset-k8s-1.7.yaml b/prog/weave-kube/weave-daemonset-k8s-1.7.yaml deleted file mode 100644 index de0c7fcc..00000000 --- a/prog/weave-kube/weave-daemonset-k8s-1.7.yaml +++ /dev/null @@ -1,200 +0,0 @@ -apiVersion: v1 -kind: List -items: - - apiVersion: v1 - kind: ServiceAccount - metadata: - name: weave-net - labels: - name: weave-net - namespace: kube-system - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: ClusterRole - metadata: - name: weave-net - labels: - name: weave-net - rules: - - apiGroups: - - '' - resources: - - pods - - namespaces - - nodes - verbs: - - get - - list - - watch - - apiGroups: - - 'networking.k8s.io' - resources: - - networkpolicies - verbs: - - get - - list - - watch - - apiGroups: - - '' - resources: - - nodes/status - verbs: - - patch - - update - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: ClusterRoleBinding - metadata: - name: weave-net - labels: - name: weave-net - roleRef: - kind: ClusterRole - name: weave-net - apiGroup: rbac.authorization.k8s.io - subjects: - - kind: ServiceAccount - name: weave-net - namespace: kube-system - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: Role - metadata: - name: weave-net - namespace: kube-system - labels: - name: weave-net - rules: - - apiGroups: - - '' - resources: - - configmaps - resourceNames: - - weave-net - verbs: - - get - - update - - apiGroups: - - '' - resources: - - configmaps - verbs: - - create - - apiVersion: rbac.authorization.k8s.io/v1beta1 - kind: RoleBinding - metadata: - name: weave-net - namespace: kube-system - labels: - name: weave-net - roleRef: - kind: Role - name: weave-net - apiGroup: rbac.authorization.k8s.io - subjects: - - kind: ServiceAccount - name: weave-net - namespace: kube-system - - apiVersion: extensions/v1beta1 - kind: DaemonSet - metadata: - name: weave-net - labels: - name: weave-net - namespace: kube-system - spec: - # Wait 5 seconds to let pod connect before rolling next pod - minReadySeconds: 5 - template: - metadata: - labels: - name: weave-net - spec: - containers: - - name: weave - command: - - /home/weave/launch.sh - env: - - name: HOSTNAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - image: 'weaveworks/weave-kube:latest' - imagePullPolicy: Always - readinessProbe: - httpGet: - host: 127.0.0.1 - path: /status - port: 6784 - resources: - requests: - cpu: 50m - securityContext: - privileged: true - volumeMounts: - - name: weavedb - mountPath: /weavedb - - name: cni-bin - mountPath: /host/opt - - name: cni-bin2 - mountPath: /host/home - - name: cni-conf - mountPath: /host/etc - - name: dbus - mountPath: /host/var/lib/dbus - - name: lib-modules - mountPath: /lib/modules - - name: xtables-lock - mountPath: /run/xtables.lock - readOnly: false - - name: weave-npc - env: - - name: HOSTNAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:latest' - imagePullPolicy: Always - resources: - requests: - cpu: 50m - securityContext: - privileged: true - volumeMounts: - - name: xtables-lock - mountPath: /run/xtables.lock - readOnly: false - hostNetwork: true - hostPID: false - restartPolicy: Always - securityContext: - seLinuxOptions: {} - serviceAccountName: weave-net - tolerations: - - effect: NoSchedule - operator: Exists - - effect: NoExecute - operator: Exists - volumes: - - name: weavedb - hostPath: - path: /var/lib/weave - - name: cni-bin - hostPath: - path: /opt - - name: cni-bin2 - hostPath: - path: /home - - name: cni-conf - hostPath: - path: /etc - - name: dbus - hostPath: - path: /var/lib/dbus - - name: lib-modules - hostPath: - path: /lib/modules - - name: xtables-lock - hostPath: - path: /run/xtables.lock - updateStrategy: - type: RollingUpdate diff --git a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh index 75afb97f..0624617d 100755 --- a/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh +++ b/test/870_weave_recovers_unreachable_ips_on_relaunch_3_test.sh @@ -50,7 +50,7 @@ function setup_kubernetes_cluster { # Ensure Kubernetes uses locally built container images and inject code coverage environment variable (or do nothing depending on $COVERAGE): sed -e "s%imagePullPolicy: Always%imagePullPolicy: Never%" \ -e "s%env:%$COVERAGE_ARGS%" \ - "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.7.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" + "$(dirname "$0")/../prog/weave-kube/weave-daemonset-k8s-1.11.yaml" | run_on "$HOST1" "$KUBECTL apply -n kube-system -f -" } function force_drop_node {